summaryrefslogtreecommitdiffstats
path: root/arch/mips/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /arch/mips/config.in
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (diff)
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r--arch/mips/config.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index aa1aba32f..b1d35fedb 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -1,4 +1,4 @@
-#
+# $Id: config.in,v 1.93 1999/05/14 22:36:58 cort Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
@@ -124,6 +124,10 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then
endmenu
fi
+source drivers/i2o/Config.in
+
+source drivers/pnp/Config.in
+
source drivers/block/Config.in
if [ "$CONFIG_NET" = "y" ]; then
@@ -257,7 +261,7 @@ else
endmenu
fi
-# source drivers/usb/Config.in
+source drivers/usb/Config.in
source fs/Config.in