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
commitf71d2a3f8e8dea7006e7884a03855037452c4545 (patch)
treedcb5140bbeb26ba513755e1a24e7f8eebdd55912 /target/linux/mpc83xx
parent094269626643de7c9d359dbc53eb57dd0d3fbb11 (diff)
downloadupstream-f71d2a3f8e8dea7006e7884a03855037452c4545.tar.gz
upstream-f71d2a3f8e8dea7006e7884a03855037452c4545.tar.bz2
upstream-f71d2a3f8e8dea7006e7884a03855037452c4545.zip
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
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