From 99a7e12f34b3661a0d1354eef83a0eef4df5e34c Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 5 Feb 2000 06:47:02 +0000
Subject: Merge with Linux 2.3.38.

---
 arch/mips64/defconfig | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'arch/mips64/defconfig')

diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 5d6d9f3d5..3fd8237b7 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -111,6 +111,12 @@ CONFIG_SKB_LARGE=y
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
+
 #
 # SCSI support
 #
@@ -127,6 +133,7 @@ CONFIG_BLK_DEV_SD=y
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
+# CONFIG_SCSI_DEBUG_QUEUES is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -271,11 +278,21 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_PRINTER is not set
 # CONFIG_PPDEV is not set
 
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
 #
 # Mice
 #
 # CONFIG_BUSMOUSE is not set
 # CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -301,7 +318,7 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_DRM_TDFX is not set
 
 #
-# Support for USB
+# USB support
 #
 # CONFIG_USB is not set
 
@@ -315,6 +332,7 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
+# CONFIG_CRAMFS is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
@@ -345,6 +363,7 @@ CONFIG_LOCKD=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_NLS is not set
 CONFIG_KCORE_ELF=y
-- 
cgit v1.2.3