diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-16 22:35:23 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-16 14:43:05 -0800 |
| commit | 7c3dbbe982ac85837f1da150ea9539a9e9a12557 (patch) | |
| tree | 10c9d071d78a2c204ce34b8d95fd0ba9139bb7d2 | |
| parent | a78719c387cc25ed97304a235a20c24f0f89399b (diff) | |
| download | linux-stable-7c3dbbe982ac85837f1da150ea9539a9e9a12557.tar.gz linux-stable-7c3dbbe982ac85837f1da150ea9539a9e9a12557.tar.bz2 linux-stable-7c3dbbe982ac85837f1da150ea9539a9e9a12557.zip | |
[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>
| -rw-r--r-- | arch/ppc/syslib/ppc4xx_dma.c | 1 | ||||
| -rw-r--r-- | include/asm-ppc/ppc4xx_dma.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c index f15e64285f96..05ccd598dd4e 100644 --- a/arch/ppc/syslib/ppc4xx_dma.c +++ b/arch/ppc/syslib/ppc4xx_dma.c @@ -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]; diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h index a415001165fa..46a086fff816 100644 --- a/include/asm-ppc/ppc4xx_dma.h +++ b/include/asm-ppc/ppc4xx_dma.h @@ -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 |