patch-2.3.23 linux/arch/i386/defconfig

• Lines: 65
• Date: Thu Oct 21 12:32:47 1999
• Orig file: v2.3.22/linux/arch/i386/defconfig
• Orig date: Fri Oct 15 15:25:13 1999

diff -u --recursive --new-file v2.3.22/linux/arch/i386/defconfig linux/arch/i386/defconfig
@@ -24,8 +24,9 @@
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
-CONFIG_1GB=y
-# CONFIG_2GB is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MTRR is not set
 CONFIG_SMP=y
@@ -40,7 +41,6 @@
 #
 # General setup
 #
-# CONFIG_BIGMEM is not set
 CONFIG_NET=y
 # CONFIG_VISWS is not set
 CONFIG_X86_IO_APIC=y
@@ -54,10 +54,12 @@
 # CONFIG_MCA is not set
 
 #
-# PCMCIA/Cardbus support
+# PCMCIA/CardBus support
 #
 CONFIG_PCMCIA=y
 CONFIG_CARDBUS=y
+CONFIG_I82365=y
+# CONFIG_TCIC is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -111,7 +113,7 @@
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_AEC6210 is not set
 CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_PIIX_TUNING is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_CPQ_DA is not set
 
@@ -284,11 +286,19 @@
 # CONFIG_WAN is not set
 
 #
-# PCMCIA network devices
+# PCMCIA network device support
 #
-CONFIG_PCMCIA_PCNET=y
+CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=y
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
 CONFIG_PCMCIA_RAYCS=y
+# CONFIG_PCMCIA_NETWAVE is not set
+# CONFIG_PCMCIA_WAVELAN is not set
 CONFIG_PCMCIA_NETCARD=y
 
 #