summaryrefslogtreecommitdiff
path: root/target/linux/x86
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-11 09:50:11 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-11 09:50:11 +0000
commit8fe94a14fefb59fd0635c65d89f78c200b7b3fab (patch)
treedcb5140bbeb26ba513755e1a24e7f8eebdd55912 /target/linux/x86
parenta97b123d80be9e250175bc6635912dd66d7ba78c (diff)
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/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