From 5a38a8e9d09c288828c22ec27fccba4d1a94dbaa Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 21 Dec 2007 15:37:07 +1100 Subject: [PATCH] --- yaml --- r: 81162 b: refs/heads/master c: 373a6da165ac3012a74fd072da340eabca55d031 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 3 ++- trunk/arch/powerpc/platforms/maple/Kconfig | 1 + trunk/arch/powerpc/platforms/pasemi/Kconfig | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ffd88208fa93..a6984a132ebd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70fbb9388365c3f6f9f17e6501a67f8636e4af08 +refs/heads/master: 373a6da165ac3012a74fd072da340eabca55d031 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 232c298c933f..d40844f9b047 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -160,6 +160,7 @@ config PPC_DCR config PPC_OF_PLATFORM_PCI bool + depends on PCI depends on PPC64 # not supported on 32 bits yet default n @@ -417,7 +418,7 @@ endmenu config ISA_DMA_API bool - default y + default !PPC_ISERIES || PCI menu "Bus options" diff --git a/trunk/arch/powerpc/platforms/maple/Kconfig b/trunk/arch/powerpc/platforms/maple/Kconfig index f7c95eb5d8ba..a6467a5591fa 100644 --- a/trunk/arch/powerpc/platforms/maple/Kconfig +++ b/trunk/arch/powerpc/platforms/maple/Kconfig @@ -1,6 +1,7 @@ config PPC_MAPLE depends on PPC_MULTIPLATFORM && PPC64 bool "Maple 970FX Evaluation Board" + select PCI select MPIC select U3_DART select MPIC_U3_HT_IRQS diff --git a/trunk/arch/powerpc/platforms/pasemi/Kconfig b/trunk/arch/powerpc/platforms/pasemi/Kconfig index 2f4dd6e4aac1..b3458a181a15 100644 --- a/trunk/arch/powerpc/platforms/pasemi/Kconfig +++ b/trunk/arch/powerpc/platforms/pasemi/Kconfig @@ -3,6 +3,7 @@ config PPC_PASEMI bool "PA Semi SoC-based platforms" default n select MPIC + select PCI select PPC_UDBG_16550 select PPC_NATIVE select MPIC_BROKEN_REGREAD