[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>
This commit is contained in:
Родитель
a78719c387
Коммит
7c3dbbe982
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
#include <asm/dma.h>
|
||||||
#include <asm/ppc4xx_dma.h>
|
#include <asm/ppc4xx_dma.h>
|
||||||
|
|
||||||
ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
|
ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
|
||||||
|
|
|
@ -33,9 +33,6 @@
|
||||||
|
|
||||||
#define MAX_PPC4xx_DMA_CHANNELS 4
|
#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
|
* Function return status codes
|
||||||
* These values are used to indicate whether or not the function
|
* These values are used to indicate whether or not the function
|
||||||
|
|
Загрузка…
Ссылка в новой задаче