backport the ssb dma device change to 2.6.30 as well

[openwrt.git] / target / linux / adm5120 / router_le / config-2.6.32

diff --git a/target/linux/adm5120/router_le/config-2.6.32 b/target/linux/adm5120/router_le/config-2.6.32
index fb363b2..c576af6 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.32
+++ b/target/linux/adm5120/router_le/config-2.6.32
@@ -44,7 +44,6 @@ CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_AMBA=y
 CONFIG_ATA=m
-# CONFIG_ATA_PIIX is not set
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 CONFIG_BITREVERSE=y
@@ -148,7 +147,6 @@ CONFIG_INPUT=m
 # CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
-# CONFIG_ISDN is not set
 CONFIG_KEXEC=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
@@ -193,6 +191,7 @@ CONFIG_NO_HZ=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 CONFIG_PATA_RB153_CF=m
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
@@ -251,7 +250,6 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
-CONFIG_VLAN_8021Q=m
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set