aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-08-04 15:08:26 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-08-28 00:24:10 -0400
commit46bab4e4b45ec522ecd5fa4a0e2b4a6e6d1f153a (patch)
treee73698c33f76704a8be1bda4e28bfc1de0af9fd5 /arch/powerpc/Kconfig
parent45223c549273bbb2c6e1bc6e3629174e8765ad01 (diff)
powerpc: Use asm-generic/dma-mapping-common.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4c0747e8ed74..6078253c6d76 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -120,7 +120,7 @@ config PPC
120 select HAVE_KRETPROBES 120 select HAVE_KRETPROBES
121 select HAVE_ARCH_TRACEHOOK 121 select HAVE_ARCH_TRACEHOOK
122 select HAVE_LMB 122 select HAVE_LMB
123 select HAVE_DMA_ATTRS if PPC64 123 select HAVE_DMA_ATTRS
124 select USE_GENERIC_SMP_HELPERS if SMP 124 select USE_GENERIC_SMP_HELPERS if SMP
125 select HAVE_OPROFILE 125 select HAVE_OPROFILE
126 select HAVE_SYSCALL_WRAPPERS if PPC64 126 select HAVE_SYSCALL_WRAPPERS if PPC64
@@ -307,10 +307,6 @@ config SWIOTLB
307 platforms where the size of a physical address is larger 307 platforms where the size of a physical address is larger
308 than the bus address. Not all platforms support this. 308 than the bus address. Not all platforms support this.
309 309
310config PPC_NEED_DMA_SYNC_OPS
311 def_bool y
312 depends on (NOT_COHERENT_CACHE || SWIOTLB)
313
314config HOTPLUG_CPU 310config HOTPLUG_CPU
315 bool "Support for enabling/disabling CPUs" 311 bool "Support for enabling/disabling CPUs"
316 depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC) 312 depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)