generic-2.6: sync patches to 2.6.33.1

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 72675e0..0379ce2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1575,6 +1575,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
+# CONFIG_PCI is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_DEBUG is not set
@@ -1588,7 +1589,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set