aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
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/x86
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/x86')
-rw-r--r--target/linux/x86/config-2.6.301
-rw-r--r--target/linux/x86/config-default1
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index e5b324382b..b66a2e9d96 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 6e26adc99e..535eab3c38 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