aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/config-2.6.25
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/generic-2.6/config-2.6.25
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/generic-2.6/config-2.6.25')
-rw-r--r--target/linux/generic-2.6/config-2.6.252
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 3ee9904321..23128911b0 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -1194,12 +1194,12 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PC300TOO is not set
# CONFIG_PCCARD is not set
# CONFIG_PCF8575 is not set
+# CONFIG_PCI is not set
# CONFIG_PCI_ATMEL is not set
# CONFIG_PCI_HERMES is not set
# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_MSI is not set
CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_ATMEL is not set
# CONFIG_PCMCIA_DEBUG is not set