diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-03-11 09:50:11 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-03-11 09:50:11 +0000 |
| commit | e1863691d9b67e4e449d5725da41abcba95483e4 (patch) | |
| tree | 23dd180bd06f1507b7160ebe8b47f9dd7c5f0841 /target/linux/generic-2.6 | |
| parent | 40bc5ef23442a5a075d2597626b6ba74586aec1b (diff) | |
| download | upstream-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/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.30 | 1 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.31 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.32 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.33 | 2 |
5 files changed, 5 insertions, 4 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 diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index 72675e0390..184e3058c6 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/target/linux/generic-2.6/config-2.6.30 @@ -1575,6 +1575,7 @@ 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_PCI200SYN is not set # CONFIG_PCI_ATMEL is not set # CONFIG_PCI_DEBUG is not set diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31 index 350f364c94..320ccb928c 100644 --- a/target/linux/generic-2.6/config-2.6.31 +++ b/target/linux/generic-2.6/config-2.6.31 @@ -1578,6 +1578,7 @@ 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_PCI200SYN is not set # CONFIG_PCI_ATMEL is not set # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set @@ -1590,7 +1591,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_STUB 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 diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32 index b0000aba6a..0a7d109b7b 100644 --- a/target/linux/generic-2.6/config-2.6.32 +++ b/target/linux/generic-2.6/config-2.6.32 @@ -1655,6 +1655,7 @@ 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_PCI200SYN is not set # CONFIG_PCI_ATMEL is not set # CONFIG_PCI_DEBUG is not set @@ -1670,7 +1671,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_STUB 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 diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33 index 66cd9dbfb3..c8e1e91b7a 100644 --- a/target/linux/generic-2.6/config-2.6.33 +++ b/target/linux/generic-2.6/config-2.6.33 @@ -1671,6 +1671,7 @@ 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_PCI200SYN is not set # CONFIG_PCI_ATMEL is not set # CONFIG_PCI_DEBUG is not set @@ -1686,7 +1687,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_STUB 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 |