From: Anton Vorontsov <avorontsov@mvista.com>
Date: Thu, 15 Jul 2010 07:38:16 +0000 (+0000)
Subject: powerpc: Fix GENERIC_ISA_DMA dependency
X-Git-Tag: v2.6.36-rc1~559^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1927445a7376e183072e6147a9641088b9b6a30e;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 25b28fd..4fa4203 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