diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-25 00:56:07 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 00:56:07 -0400 |
| commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
| tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/Kconfig | |
| parent | 271c511db9d37d6797745adb1f151a8bd2838c6f (diff) | |
| parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 7f782b338e8e..78414afb0c56 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -837,9 +837,10 @@ config MCA | |||
| 837 | bool | 837 | bool |
| 838 | 838 | ||
| 839 | config PCI | 839 | config PCI |
| 840 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) \ | 840 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ |
| 841 | || MPC7448HPC2 | 841 | || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2 |
| 842 | default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx && !PPC_86xx | 842 | default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \ |
| 843 | && !PPC_85xx && !PPC_86xx | ||
| 843 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS | 844 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS |
| 844 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 845 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |
| 845 | help | 846 | help |