[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix
authorAl Viro <viro@ftp.linux.org.uk>
Fri, 16 Dec 2005 22:35:23 +0000 (22:35 +0000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Dec 2005 22:43:05 +0000 (14:43 -0800)
DMA_MODE_{READ,WRITE} are declared in asm-powerpc/dma.h and their
declarations there match the definitions.  Old declarations in
ppc4xx_dma.h are not right anymore (wrong type, to start with).
Killed them, added include of asm/dma.h where needed.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/ppc/syslib/ppc4xx_dma.c
include/asm-ppc/ppc4xx_dma.h

index f15e64285f9628e25465a55426cc3e88d3d5d737..05ccd598dd4ec717da856ca6b12eaef4df555851 100644 (file)
@@ -30,6 +30,7 @@
 
 #include <asm/system.h>
 #include <asm/io.h>
+#include <asm/dma.h>
 #include <asm/ppc4xx_dma.h>
 
 ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
index a415001165fabd74f1d53f3c1c5dcbc07674ef7c..46a086fff81629e95d3efad1bc585ed346119702 100644 (file)
@@ -33,9 +33,6 @@
 
 #define MAX_PPC4xx_DMA_CHANNELS                4
 
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
-
 /*
  * Function return status codes
  * These values are used to indicate whether or not the function