Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=373a6da165ac3012a74fd072da340eabca55d031
Commit:     373a6da165ac3012a74fd072da340eabca55d031
Parent:     70fbb9388365c3f6f9f17e6501a67f8636e4af08
Author:     Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 21 15:37:07 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Dec 21 22:14:08 2007 +1100

    [POWERPC] Make non-PCI build work again
    
    Maple and pasemi both require PCI as does CONFIG_OF_PLATFORM_PCI.
    The default setting of CONFIG_ISA_DMA_API is set to match the protection
    around the relevant routines in asm/dma.h.
    
    I also had to remove the PMAC platform from the combined build.  The
    precis is that to build a 64 bit kernel with no PCI, you can only include
    pSeries and iSeries.
    
    Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/Kconfig                  |    3 ++-
 arch/powerpc/platforms/maple/Kconfig  |    1 +
 arch/powerpc/platforms/pasemi/Kconfig |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 232c298..d40844f 100644
--- a/arch/powerpc/Kconfig
+++ b/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/arch/powerpc/platforms/maple/Kconfig 
b/arch/powerpc/platforms/maple/Kconfig
index f7c95eb..a6467a5 100644
--- a/arch/powerpc/platforms/maple/Kconfig
+++ b/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/arch/powerpc/platforms/pasemi/Kconfig 
b/arch/powerpc/platforms/pasemi/Kconfig
index 2f4dd6e..b3458a1 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to