Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3dbbe9 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a78719c3

arch/ppc/syslib/ppc4xx_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -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];

include/asm-ppc/ppc4xx_dma.h

+0 −3
Original line number Diff line number Diff line
@@ -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