tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix

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>

authored by

Al Viro and committed by
Linus Torvalds 7c3dbbe9 a78719c3

+1 -3
+1
arch/ppc/syslib/ppc4xx_dma.c
··· 30 30 31 31 #include <asm/system.h> 32 32 #include <asm/io.h> 33 + #include <asm/dma.h> 33 34 #include <asm/ppc4xx_dma.h> 34 35 35 36 ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
-3
include/asm-ppc/ppc4xx_dma.h
··· 33 33 34 34 #define MAX_PPC4xx_DMA_CHANNELS 4 35 35 36 - /* in arch/ppc/kernel/setup.c -- Cort */ 37 - extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ; 38 - 39 36 /* 40 37 * Function return status codes 41 38 * These values are used to indicate whether or not the function