summaryrefslogtreecommitdiffstats
path: root/arch/mips/defconfig
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/defconfig
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/mips/defconfig')
-rw-r--r--arch/mips/defconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index f1631b04f..18154a1f4 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -114,10 +114,8 @@ CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -338,6 +336,11 @@ CONFIG_SGI_DS1286=y
# CONFIG_USB is not set
#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
+#
# Kernel hacking
#
CONFIG_CROSSCOMPILE=y