diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 16:39:11 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 16:39:11 +0100 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /arch/ppc/Kconfig | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
| download | op-kernel-dev-1c3f45ab2f7f879ea482501c83899505c31f7539.zip op-kernel-dev-1c3f45ab2f7f879ea482501c83899505c31f7539.tar.gz | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc/Kconfig')
| -rw-r--r-- | arch/ppc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index cd752a3..54ce6da 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -1160,12 +1160,12 @@ config PCI_QSPAN config PCI_8260 bool - depends on PCI && 8260 && !8272 + depends on PCI && 8260 default y config 8260_PCI9 bool " Enable workaround for MPC826x erratum PCI 9" - depends on PCI_8260 + depends on PCI_8260 && !ADS8272 default y choice |
