diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-06 19:21:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 19:21:09 -0500 |
| commit | 1f7d4f8395093021ed2262296179cfe71bd5e2ec (patch) | |
| tree | 30c69554b5a249ed5b90c52388165545df154c40 /arch/powerpc/Kconfig | |
| parent | b370b08274a25cf1e2015fb7ce65c43173c8156f (diff) | |
| parent | 25ae3a0739c69425a911925b43213895a9802b98 (diff) | |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.25
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index cf030b004415..1348bbc92510 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -512,7 +512,7 @@ config PCI | |||
| 512 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ | 512 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ |
| 513 | || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ | 513 | || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ |
| 514 | || PPC_PS3 || 44x | 514 | || PPC_PS3 || 44x |
| 515 | default y if !40x && !CPM2 && !8xx && !PPC_83xx \ | 515 | default y if !40x && !CPM2 && !8xx && !PPC_MPC512x && !PPC_83xx \ |
| 516 | && !PPC_85xx && !PPC_86xx | 516 | && !PPC_85xx && !PPC_86xx |
| 517 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx | 517 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx |
| 518 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 518 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |