diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-03-04 17:04:44 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-03-09 15:03:26 +1100 |
commit | bed59275810a55500e885cbdc5c2a0507f13c00e (patch) | |
tree | 9f0fba370b8a65a15c19ecab9e48df3f9264dc13 /arch/powerpc/Kconfig | |
parent | be9e95b17e150c7b6933cb2f1e1c46a501976080 (diff) | |
download | blackbird-op-linux-bed59275810a55500e885cbdc5c2a0507f13c00e.tar.gz blackbird-op-linux-bed59275810a55500e885cbdc5c2a0507f13c00e.zip |
[POWERPC] Allow pSeries to build without CONFIG_PCI
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 6dfbd52694ab..e7205273ff37 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -89,7 +89,7 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER config ARCH_MAY_HAVE_PC_FDC bool - default y + default !PPC_PSERIES || PCI config PPC_OF def_bool y @@ -1028,7 +1028,8 @@ config MCA config PCI bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ - || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2 || PPC_PS3 + || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ + || MPC7448HPC2 || PPC_PS3 default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \ && !PPC_85xx && !PPC_86xx default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS |