Skip to content

Commit

Permalink
[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Dec 16, 2005
1 parent a78719c commit 7c3dbbe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions arch/ppc/syslib/ppc4xx_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
3 changes: 0 additions & 3 deletions include/asm-ppc/ppc4xx_dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7c3dbbe

Please sign in to comment.