Commit 76ec9f1c authored by Linus Torvalds's avatar Linus Torvalds

Update defconfig for VLAN and IDE changes

parent a9efbc0e
...@@ -187,6 +187,7 @@ CONFIG_IP_MULTICAST=y ...@@ -187,6 +187,7 @@ CONFIG_IP_MULTICAST=y
# CONFIG_IP_MROUTE is not set # CONFIG_IP_MROUTE is not set
# CONFIG_INET_ECN is not set # CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set # CONFIG_SYN_COOKIES is not set
# CONFIG_VLAN_8021Q is not set
# #
# #
...@@ -214,7 +215,7 @@ CONFIG_IP_MULTICAST=y ...@@ -214,7 +215,7 @@ CONFIG_IP_MULTICAST=y
CONFIG_IDE=y CONFIG_IDE=y
# #
# IDE, ATA and ATAPI Block devices # ATA and ATAPI Block devices
# #
CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDE=y
...@@ -249,9 +250,9 @@ CONFIG_BLK_DEV_CMD640=y ...@@ -249,9 +250,9 @@ CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_ISAPNP is not set # CONFIG_BLK_DEV_ISAPNP is not set
CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_RZ1000=y
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDEPCI_SHARE_IRQ=y
CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_IDEDMA_PCI_AUTO=y CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set # CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_BLK_DEV_IDEDMA=y CONFIG_BLK_DEV_IDEDMA=y
...@@ -284,8 +285,8 @@ CONFIG_PIIX_TUNING=y ...@@ -284,8 +285,8 @@ CONFIG_PIIX_TUNING=y
# CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_IDE_CHIPSETS is not set # CONFIG_IDE_CHIPSETS is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_DMA_NONPCI is not set # CONFIG_DMA_NONPCI is not set
CONFIG_BLK_DEV_IDE_MODES=y CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set # CONFIG_BLK_DEV_ATARAID is not set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment