summaryrefslogtreecommitdiffstats
path: root/arch/mips64/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
commit33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch)
tree2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /arch/mips64/config.in
parent216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff)
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/mips64/config.in')
-rw-r--r--arch/mips64/config.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index dafaf16c8..c1c3d59cf 100644
--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.9 2000/01/29 01:41:59 ralf Exp $
+# $Id: config.in,v 1.10 2000/01/31 21:57:09 kanoj Exp $
#
# For a description of the syntax of this configuration file,
# see the Configure script.
@@ -72,6 +72,10 @@ fi
bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN
bool 'Networking support' CONFIG_NET
+
+source drivers/pci/Config.in
+source drivers/pcmcia/Config.in
+
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
@@ -90,6 +94,8 @@ if [ "$CONFIG_MODULES" = "y" ]; then
bool 'Kernel module loader' CONFIG_KMOD
fi
+source drivers/pci/Config.in
+
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'Support for frame buffer devices (EXPERIMENTAL)' CONFIG_FB
fi