summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@mvista.com>2010-07-15 07:38:16 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-31 14:56:31 +1000
commit1927445a7376e183072e6147a9641088b9b6a30e (patch)
tree839f8eab9332761126c1db101b5eb3d960b538b2
parente9ae9dabfc1df26d5eff0102c4d359f534e11087 (diff)
downloadlinux-1927445a7376e183072e6147a9641088b9b6a30e.tar.bz2
powerpc: Fix GENERIC_ISA_DMA dependency
On PowerPC we should always use generic ISA DMA API implementation as there is simply no other implementation exist. Without this patch, the following build error pops up: sound/built-in.o: In function 'snd_dma_pointer': (.text+0x74ae): undefined reference to 'dma_spin_lock' ... make: *** [.tmp_vmlinux1] Error 1 This is PPC_85xx, SMP and some sound drivers set to =y. Signed-off-by: Anton Vorontsov <avorontsov@mvista.com> Acked-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 25b28fdc6767..4fa420381044 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -669,7 +669,7 @@ config NEED_SG_DMA_LENGTH
config GENERIC_ISA_DMA
bool
- depends on PPC64 || POWER4 || 6xx && !CPM2
+ depends on ISA_DMA_API
default y
config PPC_INDIRECT_PCI