diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-21 15:37:07 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-12-21 22:14:08 +1100 |
| commit | 373a6da165ac3012a74fd072da340eabca55d031 (patch) | |
| tree | b78d45f1632aa7bf5828d04694b871ca975ba73b /arch/powerpc/Kconfig | |
| parent | [POWERPC] Pointers marked as __iomem do not need to be volatile (diff) | |
| download | linux-dev-373a6da165ac3012a74fd072da340eabca55d031.tar.xz linux-dev-373a6da165ac3012a74fd072da340eabca55d031.zip | |
[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 <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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 232c298c933f..d40844f9b047 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" |