summaryrefslogtreecommitdiffstats
path: root/arch/mips/defconfig-cobalt
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-cobalt
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/mips/defconfig-cobalt')
-rw-r--r--arch/mips/defconfig-cobalt25
1 files changed, 18 insertions, 7 deletions
diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt
index 7cfa2345d..627cc710b 100644
--- a/arch/mips/defconfig-cobalt
+++ b/arch/mips/defconfig-cobalt
@@ -113,13 +113,11 @@ CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_PIMSM_V1 is not set
# CONFIG_IP_PIMSM_V2 is not set
-CONFIG_IP_ALIAS=y
# CONFIG_INET_ECN is not set
CONFIG_SYN_COOKIES=y
# CONFIG_IPV6 is not set
@@ -266,6 +264,7 @@ CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
# CONFIG_NET_SB1000 is not set
#
@@ -354,6 +353,7 @@ CONFIG_DE_AOC=y
# CONFIG_HISAX_NO_LLC is not set
# CONFIG_HISAX_NO_KEYPAD is not set
CONFIG_HISAX_1TR6=y
+# CONFIG_HISAX_NI1 is not set
#
# HiSax supported cards
@@ -375,6 +375,7 @@ CONFIG_HISAX_ELSA=y
# CONFIG_HISAX_SPORTSTER is not set
# CONFIG_HISAX_MIC is not set
# CONFIG_HISAX_NETJET is not set
+# CONFIG_HISAX_NETJET_U is not set
# CONFIG_HISAX_NICCY is not set
# CONFIG_HISAX_ISURF is not set
# CONFIG_HISAX_HSTSAPHIR is not set
@@ -426,6 +427,10 @@ CONFIG_HISAX_ELSA=y
# Joysticks
#
# CONFIG_JOYSTICK is not set
+
+#
+# Input core support is needed for joysticks
+#
# CONFIG_QIC02_TAPE is not set
#
@@ -435,11 +440,6 @@ CONFIG_HISAX_ELSA=y
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
CONFIG_RTC=y
-
-#
-# Video For Linux
-#
-# CONFIG_VIDEO_DEV is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
@@ -452,6 +452,11 @@ CONFIG_RTC=y
# CONFIG_DRM is not set
#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
# File systems
#
CONFIG_QUOTA=y
@@ -504,6 +509,7 @@ CONFIG_NFS_FS=y
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_REMOTE=""
# CONFIG_NCP_FS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -572,6 +578,11 @@ CONFIG_NLS_UTF8=m
# CONFIG_USB is not set
#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
+#
# Kernel hacking
#
# CONFIG_CROSSCOMPILE is not set