diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /arch/ppc/Kconfig | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
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 cd752a3cf3bd..54ce6da22644 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
| @@ -1160,12 +1160,12 @@ config PCI_QSPAN | |||
| 1160 | 1160 | ||
| 1161 | config PCI_8260 | 1161 | config PCI_8260 |
| 1162 | bool | 1162 | bool |
| 1163 | depends on PCI && 8260 && !8272 | 1163 | depends on PCI && 8260 |
| 1164 | default y | 1164 | default y |
| 1165 | 1165 | ||
| 1166 | config 8260_PCI9 | 1166 | config 8260_PCI9 |
| 1167 | bool " Enable workaround for MPC826x erratum PCI 9" | 1167 | bool " Enable workaround for MPC826x erratum PCI 9" |
| 1168 | depends on PCI_8260 | 1168 | depends on PCI_8260 && !ADS8272 |
| 1169 | default y | 1169 | default y |
| 1170 | 1170 | ||
| 1171 | choice | 1171 | choice |