summaryrefslogtreecommitdiffstats
path: root/arch/i386/defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/defconfig')
-rw-r--r--arch/i386/defconfig11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 80f68ec31..3a8d743f7 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -107,6 +107,7 @@ CONFIG_BLK_DEV_FD=y
#
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_LVM is not set
# CONFIG_BLK_DEV_MD is not set
# CONFIG_MD_LINEAR is not set
# CONFIG_MD_STRIPED is not set
@@ -189,8 +190,8 @@ CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_IDEDMA_PCI_EXPERIMENTAL is not set
# CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_AEC6210 is not set
-# CONFIG_AEC6210_TUNING is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_AEC62XX_TUNING is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_WDC_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD7409 is not set
@@ -214,6 +215,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_VIA82CXXX_TUNING is not set
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
CONFIG_BLK_DEV_IDE_MODES=y
@@ -385,7 +387,10 @@ CONFIG_PCMCIA_PCNET=y
# CONFIG_PCMCIA_XIRC2PS is not set
# CONFIG_ARCNET_COM20020_CS is not set
# CONFIG_PCMCIA_IBMTR is not set
-# CONFIG_PCMCIA_3C575 is not set
+
+#
+# 3Com 3c575 moved to Ethernet 10/100 menu
+#
# CONFIG_PCMCIA_XIRTULIP is not set
CONFIG_NET_PCMCIA_RADIO=y
CONFIG_PCMCIA_RAYCS=y