patch-2.3.17 linux/arch/i386/defconfig

• Lines: 38
• Date: Tue Sep 7 10:49:32 1999
• Orig file: v2.3.16/linux/arch/i386/defconfig
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.16/linux/arch/i386/defconfig linux/arch/i386/defconfig
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_X86=y
+CONFIG_ISA=y
 
 #
 # Code maturity level options
@@ -50,6 +51,12 @@
 # CONFIG_VISWS is not set
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
+
+#
+# PCMCIA/Cardbus support
+#
+CONFIG_PCMCIA=y
+CONFIG_CARDBUS=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -358,6 +365,7 @@
 # CONFIG_VFAT_FS is not set
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
+# CONFIG_UDF_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -373,6 +381,8 @@
 #
 # CONFIG_CODA_FS is not set
 CONFIG_NFS_FS=y
+CONFIG_NFSD=y
+# CONFIG_NFSD_SUN is not set
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y
 # CONFIG_SMB_FS is not set