summaryrefslogtreecommitdiffstats
path: root/arch/mips/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-13 20:55:15 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-13 20:55:15 +0000
commit1471f525455788c20b130690e0f104df451aeb43 (patch)
tree3778beba56558beb9a9548ea5b467e9c44ea966f /arch/mips/config.in
parente80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff)
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r--arch/mips/config.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index 189a2126b..c26394e33 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.42 2000/02/24 00:12:40 ralf Exp $
+# $Id: config.in,v 1.43 2000/03/12 10:07:55 harald Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
@@ -272,7 +272,7 @@ fi
source drivers/usb/Config.in
-source drivers/misc/Config.in
+#source drivers/misc/Config.in
source fs/Config.in