aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc83xx
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-03-11 09:50:11 +0000
committerNicolas Thill <nico@openwrt.org>2010-03-11 09:50:11 +0000
commite1863691d9b67e4e449d5725da41abcba95483e4 (patch)
tree23dd180bd06f1507b7160ebe8b47f9dd7c5f0841 /target/linux/mpc83xx
parent40bc5ef23442a5a075d2597626b6ba74586aec1b (diff)
downloadupstream-e1863691d9b67e4e449d5725da41abcba95483e4.tar.gz
upstream-e1863691d9b67e4e449d5725da41abcba95483e4.tar.bz2
upstream-e1863691d9b67e4e449d5725da41abcba95483e4.zip
do *not* enable CONFIG_PCI in generic config, but on targets where it makes sense instead (partially revert [18370])
SVN-Revision: 20136
Diffstat (limited to 'target/linux/mpc83xx')
-rw-r--r--target/linux/mpc83xx/config-2.6.321
-rw-r--r--target/linux/mpc83xx/config-default1
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/mpc83xx/config-2.6.32 b/target/linux/mpc83xx/config-2.6.32
index 030a7b4116..15e121a586 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 20413ec219..eb1889f5bb 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