diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 08:59:06 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 08:59:06 +1000 |
| commit | 75d43b2d0a323ba894d85060888f039e41b441ca (patch) | |
| tree | 2f49ace1f85510e8b21974e6dd45dfcc2a87666a /arch/powerpc/Kconfig | |
| parent | d0b7abb2c7c05552aca2a0358c53b6a48eab2843 (diff) | |
| parent | cb0446c1b625326682ec4f9d1dd10779433646bc (diff) | |
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/Kconfig | 4 |
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" |