aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/amazon
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/amazon
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/amazon')
-rw-r--r--target/linux/amazon/config-2.6.301
-rw-r--r--target/linux/amazon/config-2.6.321
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/amazon/config-2.6.30 b/target/linux/amazon/config-2.6.30
index 644a36c2a2..45f2e6366e 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 d692217e2e..9239dabc21 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