summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2014-10-04 00:59:06 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2014-10-04 00:59:06 +0200
commit75d43b2d0a323ba894d85060888f039e41b441ca (patch)
tree2f49ace1f85510e8b21974e6dd45dfcc2a87666a /arch/powerpc/Kconfig
parentpowerpc: Enable CONFIG_CRASH_DUMP=y for ppc64_defconfig (diff)
parentRevert "powerpc/fsl_msi: spread msi ints across different MSIRs" (diff)
downloadlinux-75d43b2d0a323ba894d85060888f039e41b441ca.tar.xz
linux-75d43b2d0a323ba894d85060888f039e41b441ca.zip
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
Freescale updates from Scott (27 commits): "Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board support, and PrPMC PCI enumeration."
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 56da47247fcc..98ae8b714d31 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -288,6 +288,10 @@ config PPC_EMULATE_SSTEP
bool
default y if KPROBES || UPROBES || XMON || HAVE_HW_BREAKPOINT
+config ZONE_DMA32
+ bool
+ default y if PPC64
+
source "init/Kconfig"
source "kernel/Kconfig.freezer"