summaryrefslogtreecommitdiffstats
path: root/arch/mips/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
commit1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch)
tree141e31f89f18b9fe0831f31852e0435ceaccafc5 /arch/mips/config.in
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r--arch/mips/config.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index fdca265d2..5fd3c002e 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -305,6 +305,8 @@ fi
if [ "$CONFIG_DECSTATION" != "y" -a \
"$CONFIG_SGI_IP22" != "y" ]; then
source drivers/char/Config.in
+
+ source drivers/media/Config.in
fi
if [ "$CONFIG_DECSTATION" = "y" ]; then
@@ -388,6 +390,7 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then
fi
source drivers/usb/Config.in
+source drivers/input/Config.in
mainmenu_option next_comment
comment 'Kernel hacking'