]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc: include asm/dma.h explicitly
authorLaura Abbott <lauraa@codeaurora.org>
Thu, 22 May 2014 00:44:20 +0000 (10:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 May 2014 00:44:20 +0000 (10:44 +1000)
commit ff35bd54456e18878c361a8a2deeb41c9688458f (lib/scatterlist: make
ARCH_HAS_SG_CHAIN an actual Kconfig) changed powerpc to use the generic
scatterlist.h.  The powerpc scatterlist.h header was including asm/dma.h
as well so removing the include broke a few things:

arch/powerpc/platforms/52xx/efika.c: In function 'efika_probe':
arch/powerpc/platforms/52xx/efika.c:210:2: error: 'ISA_DMA_THRESHOLD' undeclared
arch/powerpc/platforms/52xx/efika.c:211:2: error: 'DMA_MODE_READ' undeclared
arch/powerpc/platforms/52xx/efika.c:212:2: error: 'DMA_MODE_WRITE' undeclared

Explicitly include asm/dma.h where necessary.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: kbuild test robot <fengguang.wu@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/powerpc/platforms/52xx/efika.c
arch/powerpc/platforms/amigaone/setup.c

index 18c10482019811fd4fa25cbf1b0972ef87d4d0c7..47d66794cf3e0e2d6fa7bc7980c0550d2f3a4620 100644 (file)
@@ -13,6 +13,7 @@
 #include <generated/utsrelease.h>
 #include <linux/pci.h>
 #include <linux/of.h>
+#include <asm/dma.h>
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
index 03aabc0e16ac2f212ec6d5ae6a78909333e606c6..2fe12046279ef53483f5b0c1659123dad1d7a0e4 100644 (file)
@@ -24,6 +24,7 @@
 #include <asm/i8259.h>
 #include <asm/time.h>
 #include <asm/udbg.h>
+#include <asm/dma.h>
 
 extern void __flush_disable_L1(void);