do *not* enable CONFIG_PCI in generic config, but on targets where it makes sense instead (partially revert [18370])

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20136 3c298f89-4303-0410-b956-a3cf2f4a3e73

59 files changed, 51 insertions, 12 deletions

diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30
index 931987495..cde882d2e 100644
--- a/target/linux/adm5120/router_be/config-2.6.30
+++ b/target/linux/adm5120/router_be/config-2.6.30
@@ -143,6 +143,7 @@ CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/adm5120/router_be/config-2.6.32 b/target/linux/adm5120/router_be/config-2.6.32
index f919e0d66..b89fb6325 100644
--- a/target/linux/adm5120/router_be/config-2.6.32
+++ b/target/linux/adm5120/router_be/config-2.6.32
@@ -147,6 +147,7 @@ CONFIG_NLS=m
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/amazon/config-2.6.30 b/target/linux/amazon/config-2.6.30
index 644a36c2a..45f2e6366 100644
--- a/target/linux/amazon/config-2.6.30
+++ b/target/linux/amazon/config-2.6.30
@@ -116,6 +116,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/target/linux/amazon/config-2.6.32 b/target/linux/amazon/config-2.6.32
index d692217e2..9239dabc2 100644
--- a/target/linux/amazon/config-2.6.32
+++ b/target/linux/amazon/config-2.6.32
@@ -119,6 +119,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/target/linux/ar7/config-2.6.30 b/target/linux/ar7/config-2.6.30
index e407e85e7..4f1eee44f 100644
--- a/target/linux/ar7/config-2.6.30
+++ b/target/linux/ar7/config-2.6.30
@@ -105,7 +105,6 @@ CONFIG_NO_EXCEPT_FILL=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PCI is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 4cc3d19ab..61a530e61 100644
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -183,6 +183,7 @@ CONFIG_NET_DSA_TAG_TRAILER=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33
index a0ad71f1b..3b6108ccd 100644
--- a/target/linux/ar71xx/config-2.6.33
+++ b/target/linux/ar71xx/config-2.6.33
@@ -223,6 +223,7 @@ CONFIG_NET_DSA_TAG_TRAILER=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index 572d59611..593dd42a4 100644
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -130,7 +130,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_NF_NAT_TFTP is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_OUTER_CACHE is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYLIB=y
 # CONFIG_SCSI_WAIT_SCAN is not set
diff --git a/target/linux/atheros/config-2.6.30 b/target/linux/atheros/config-2.6.30
index d962a539b..bf229a54a 100644
--- a/target/linux/atheros/config-2.6.30
+++ b/target/linux/atheros/config-2.6.30
@@ -115,6 +115,7 @@ CONFIG_MVSWITCH_PHY=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/atheros/config-2.6.31 b/target/linux/atheros/config-2.6.31
index 9b8642548..472244516 100644
--- a/target/linux/atheros/config-2.6.31
+++ b/target/linux/atheros/config-2.6.31
@@ -121,6 +121,7 @@ CONFIG_MVSWITCH_PHY=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/atheros/config-2.6.32 b/target/linux/atheros/config-2.6.32
index 5b56d47de..33b754cf0 100644
--- a/target/linux/atheros/config-2.6.32
+++ b/target/linux/atheros/config-2.6.32
@@ -117,6 +117,7 @@ CONFIG_MVSWITCH_PHY=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33
index 575c95965..7a9458d9c 100644
--- a/target/linux/atheros/config-2.6.33
+++ b/target/linux/atheros/config-2.6.33
@@ -159,6 +159,7 @@ CONFIG_MVSWITCH_PHY=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/au1000/au1500/config-2.6.30 b/target/linux/au1000/au1500/config-2.6.30
index 74fad69dd..92ab1568f 100644
--- a/target/linux/au1000/au1500/config-2.6.30
+++ b/target/linux/au1000/au1500/config-2.6.30
@@ -140,6 +140,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
diff --git a/target/linux/au1000/au1500/config-2.6.32 b/target/linux/au1000/au1500/config-2.6.32
index 998a3f8f2..38a93cf0b 100644
--- a/target/linux/au1000/au1500/config-2.6.32
+++ b/target/linux/au1000/au1500/config-2.6.32
@@ -138,6 +138,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
diff --git a/target/linux/au1000/au1550/config-2.6.30 b/target/linux/au1000/au1550/config-2.6.30
index 407a256d4..96e819065 100644
--- a/target/linux/au1000/au1550/config-2.6.30
+++ b/target/linux/au1000/au1550/config-2.6.30
@@ -207,6 +207,7 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_IOCTL=y
diff --git a/target/linux/au1000/au1550/config-2.6.32 b/target/linux/au1000/au1550/config-2.6.32
index 407a256d4..96e819065 100644
--- a/target/linux/au1000/au1550/config-2.6.32
+++ b/target/linux/au1000/au1550/config-2.6.32
@@ -207,6 +207,7 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_IOCTL=y
diff --git a/target/linux/brcm47xx/config-2.6.30 b/target/linux/brcm47xx/config-2.6.30
index 33e2db027..117cbb0aa 100644
--- a/target/linux/brcm47xx/config-2.6.30
+++ b/target/linux/brcm47xx/config-2.6.30
@@ -115,6 +115,7 @@ CONFIG_MTD_BCM47XX=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm47xx/config-2.6.31 b/target/linux/brcm47xx/config-2.6.31
index ee0135a2e..48c808f23 100644
--- a/target/linux/brcm47xx/config-2.6.31
+++ b/target/linux/brcm47xx/config-2.6.31
@@ -116,6 +116,7 @@ CONFIG_MTD_BCM47XX=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm47xx/config-2.6.32 b/target/linux/brcm47xx/config-2.6.32
index 5780b9df7..febf2ea72 100644
--- a/target/linux/brcm47xx/config-2.6.32
+++ b/target/linux/brcm47xx/config-2.6.32
@@ -125,6 +125,7 @@ CONFIG_MTD_BCM47XX=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33
index 2c3a23fa8..ffc491336 100644
--- a/target/linux/brcm47xx/config-2.6.33
+++ b/target/linux/brcm47xx/config-2.6.33
@@ -152,6 +152,7 @@ CONFIG_MTD_BCM47XX=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm63xx/config-2.6.30 b/target/linux/brcm63xx/config-2.6.30
index 853a30f70..b1acfe703 100644
--- a/target/linux/brcm63xx/config-2.6.30
+++ b/target/linux/brcm63xx/config-2.6.30
@@ -152,6 +152,7 @@ CONFIG_NOP_TRACER=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm63xx/config-2.6.32 b/target/linux/brcm63xx/config-2.6.32
index e250a030b..d435f329d 100644
--- a/target/linux/brcm63xx/config-2.6.32
+++ b/target/linux/brcm63xx/config-2.6.32
@@ -143,6 +143,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/brcm63xx/config-2.6.33 b/target/linux/brcm63xx/config-2.6.33
index 22d519ccf..c9dd63814 100644
--- a/target/linux/brcm63xx/config-2.6.33
+++ b/target/linux/brcm63xx/config-2.6.33
@@ -196,6 +196,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/cobalt/config-2.6.30 b/target/linux/cobalt/config-2.6.30
index bf150e816..078d2ddf8 100644
--- a/target/linux/cobalt/config-2.6.30
+++ b/target/linux/cobalt/config-2.6.30
@@ -165,6 +165,7 @@ CONFIG_NET_TULIP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PATA_VIA=y
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GT64XXX_PCI0=y
diff --git a/target/linux/cobalt/config-2.6.32 b/target/linux/cobalt/config-2.6.32
index e1ade55f0..b561ce468 100644
--- a/target/linux/cobalt/config-2.6.32
+++ b/target/linux/cobalt/config-2.6.32
@@ -79,6 +79,7 @@
 # CONFIG_NXP_STB225 is not set
 # CONFIG_PACKET_MMAP is not set
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/target/linux/gemini/config-default b/target/linux/gemini/config-default
index 418ed2e11..9404cd400 100644
--- a/target/linux/gemini/config-default
+++ b/target/linux/gemini/config-default
@@ -101,6 +101,7 @@ CONFIG_NLATTR=y
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PCI=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PHYLIB=y
 CONFIG_SCSI=m
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 3ee990432..23128911b 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -1194,12 +1194,12 @@ 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_PCI_ATMEL is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI 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
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 72675e039..184e3058c 100644
--- 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
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 350f364c9..320ccb928 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1578,6 +1578,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_DISABLE_COMMON_QUIRKS is not set
@@ -1590,7 +1591,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
diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index b0000aba6..0a7d109b7 100644
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -1655,6 +1655,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
@@ -1670,7 +1671,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
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 66cd9dbfb..c8e1e91b7 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -1671,6 +1671,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
@@ -1686,7 +1687,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
diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index 80780934a..abb11e4c6 100644
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -159,7 +159,6 @@ CONFIG_MTD_UBI=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_PM_DEBUG is not set
diff --git a/target/linux/ifxmips/config-2.6.30 b/target/linux/ifxmips/config-2.6.30
index 0dffd566b..e41b2881b 100644
--- a/target/linux/ifxmips/config-2.6.30
+++ b/target/linux/ifxmips/config-2.6.30
@@ -118,6 +118,7 @@ CONFIG_MTD_IFXMIPS=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index d3dfe83be..81d2e2ba3 100644
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -93,6 +93,7 @@ CONFIG_NET_DMA=y
 CONFIG_NLS=m
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PCI=y
 CONFIG_PLAT_IOP=y
 CONFIG_R8169_VLAN=y
 CONFIG_R8169=y
diff --git a/target/linux/ixp4xx/config-2.6.32 b/target/linux/ixp4xx/config-2.6.32
index ace714862..0b3325275 100644
--- a/target/linux/ixp4xx/config-2.6.32
+++ b/target/linux/ixp4xx/config-2.6.32
@@ -124,6 +124,7 @@ CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PCI=y
 CONFIG_PHYLIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index b20ba2b7c..3f6e03da3 100644
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -128,6 +128,7 @@ CONFIG_OUTER_CACHE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_ARTOP=m
+CONFIG_PCI=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PHYLIB=y
 CONFIG_PLAT_ORION=y
diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-2.6.30
index 5c8602fbc..20f2702a0 100644
--- a/target/linux/mpc52xx/config-2.6.30
+++ b/target/linux/mpc52xx/config-2.6.30
@@ -153,6 +153,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PATA_MPC52xx is not set
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_LEGACY=y
diff --git a/target/linux/mpc83xx/config-2.6.32 b/target/linux/mpc83xx/config-2.6.32
index 030a7b411..15e121a58 100644
--- a/target/linux/mpc83xx/config-2.6.32
+++ b/target/linux/mpc83xx/config-2.6.32
@@ -130,6 +130,7 @@ CONFIG_OF_MDIO=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m
+CONFIG_PCI=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEPORTBUS=y
diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
index 20413ec21..eb1889f5b 100644
--- a/target/linux/mpc83xx/config-default
+++ b/target/linux/mpc83xx/config-default
@@ -124,6 +124,7 @@ CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEAER_INJECT is not set
diff --git a/target/linux/octeon/config-2.6.30 b/target/linux/octeon/config-2.6.30
index d792624bb..b0c96c11d 100644
--- a/target/linux/octeon/config-2.6.30
+++ b/target/linux/octeon/config-2.6.30
@@ -196,6 +196,7 @@ CONFIG_OCTEON_MGMT=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYS_ADDR_T_64BIT=y
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 0f9eb27f3..ed16c7e21 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -177,6 +177,7 @@ CONFIG_NET_DSA=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m
 # CONFIG_PC300 is not set
+CONFIG_PCI=y
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PLAT_ORION=y
diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index 252637a59..41cc7dd4c 100644
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -123,6 +123,7 @@ CONFIG_OF=y
 CONFIG_OPENRB=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEAER=y
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index 4a0b3e34a..bf540f6c3 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -113,6 +113,7 @@ CONFIG_OF_GPIO=y
 CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEAER=y
diff --git a/target/linux/ps3/config-2.6.30 b/target/linux/ps3/config-2.6.30
index 333f4fd31..2fad43e9d 100644
--- a/target/linux/ps3/config-2.6.30
+++ b/target/linux/ps3/config-2.6.30
@@ -209,7 +209,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCI_DOMAINS is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PHYSICAL_START=0x00000000
diff --git a/target/linux/pxcab/config-2.6.30 b/target/linux/pxcab/config-2.6.30
index 7c28c27b3..5b5ecd10f 100644
--- a/target/linux/pxcab/config-2.6.30
+++ b/target/linux/pxcab/config-2.6.30
@@ -283,6 +283,7 @@ CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
diff --git a/target/linux/pxcab/config-2.6.31 b/target/linux/pxcab/config-2.6.31
index 147fd498f..3221b038e 100644
--- a/target/linux/pxcab/config-2.6.31
+++ b/target/linux/pxcab/config-2.6.31
@@ -300,6 +300,7 @@ CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
diff --git a/target/linux/ramips/rt288x/config-2.6.32 b/target/linux/ramips/rt288x/config-2.6.32
index 2be3b0d3b..7d7a45adf 100644
--- a/target/linux/ramips/rt288x/config-2.6.32
+++ b/target/linux/ramips/rt288x/config-2.6.32
@@ -108,6 +108,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/ramips/rt305x/config-2.6.32 b/target/linux/ramips/rt305x/config-2.6.32
index db1c3a4e2..6058fed0e 100644
--- a/target/linux/ramips/rt305x/config-2.6.32
+++ b/target/linux/ramips/rt305x/config-2.6.32
@@ -105,6 +105,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/target/linux/rb532/config-default b/target/linux/rb532/config-default
index a363c997b..e68846163 100644
--- a/target/linux/rb532/config-default
+++ b/target/linux/rb532/config-default
@@ -129,6 +129,7 @@ CONFIG_NF_CT_ACCT=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_RB532=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PMC_MSP is not set
diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30
index 0788d5562..b18048b4b 100644
--- a/target/linux/rdc/config-2.6.30
+++ b/target/linux/rdc/config-2.6.30
@@ -205,6 +205,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
diff --git a/target/linux/rdc/config-2.6.32 b/target/linux/rdc/config-2.6.32
index b96fca3ed..4a1f9f38e 100644
--- a/target/linux/rdc/config-2.6.32
+++ b/target/linux/rdc/config-2.6.32
@@ -207,6 +207,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index 30cb86d14..9a6af9541 100644
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -266,7 +266,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCF50633_ADC=y
 CONFIG_PCF50633_GPIO=y
-# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PDA_POWER is not set
 CONFIG_PLAT_S3C24XX=y
diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
index 22dcb126c..375f2fe30 100644
--- a/target/linux/sibyte/config-default
+++ b/target/linux/sibyte/config-default
@@ -135,6 +135,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 CONFIG_PHYS_ADDR_T_64BIT=y
diff --git a/target/linux/ubicom32/config-default b/target/linux/ubicom32/config-default
index 47cb52995..57dbce039 100755
--- a/target/linux/ubicom32/config-default
+++ b/target/linux/ubicom32/config-default
@@ -126,6 +126,7 @@ CONFIG_OCM_MODULES_RESERVATION=41
 CONFIG_OLD_40400010_SYSTEM_CALL=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DEV0_IDSEL=0x001000000
 CONFIG_PCI_DEV1_IDSEL=0x002000000
 CONFIG_PRINTK_TIME=y
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 748df034a..b8f78dc7e 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -167,4 +167,3 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_PCI is not set
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index d667e8917..6df42ff3a 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -124,4 +124,3 @@ CONFIG_UML_X86=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_PCI is not set
diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index e5b324382..b66a2e9d9 100644
--- a/target/linux/x86/config-2.6.30
+++ b/target/linux/x86/config-2.6.30
@@ -278,6 +278,7 @@ CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 6e26adc99..535eab3c3 100644
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -328,6 +328,7 @@ CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
diff --git a/target/linux/xburst/config-2.6.32 b/target/linux/xburst/config-2.6.32
index 78390a0f0..bbaaeecb0 100644
--- a/target/linux/xburst/config-2.6.32
+++ b/target/linux/xburst/config-2.6.32
@@ -251,7 +251,6 @@ CONFIG_NLS=y
 # CONFIG_NXP_STB225 is not set
 # CONFIG_PACKET_MMAP is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PCI is not set
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_PMC_MSP is not set