aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-02 12:34:55 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-01-02 12:34:55 +0000
commitf0ffc816250a8cc28e6824326e2d58333e058eca (patch)
tree1949fcb94b07e1dac522fcaae53cb5343c788ab4 /arch/arm/include
parent4e57ea9a2e8e807e20f64d5b53fbee2c7c9e87ae (diff)
[ARM] dma: remove dmamode_t typedef
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/dma.h7
-rw-r--r--arch/arm/include/asm/mach/dma.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 59f59c6c79f..7edf3536df2 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -22,11 +22,6 @@
#include <mach/isa-dma.h>
/*
- * DMA modes
- */
-typedef unsigned int dmamode_t;
-
-/*
* The DMA modes reflect the settings for the ISA DMA controller
*/
#define DMA_MODE_MASK 0xcc
@@ -125,7 +120,7 @@ extern void set_dma_count(unsigned int chan, unsigned long count);
* DMA transfer direction immediately, but defer it to the
* enable_dma().
*/
-extern void set_dma_mode(unsigned int chan, dmamode_t mode);
+extern void set_dma_mode(unsigned int chan, unsigned int mode);
/* Set the transfer speed for this channel
*/
diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
index 3122adae80b..5166145d8a3 100644
--- a/arch/arm/include/asm/mach/dma.h
+++ b/arch/arm/include/asm/mach/dma.h
@@ -34,7 +34,7 @@ struct dma_struct {
unsigned int active:1; /* Transfer active */
unsigned int invalid:1; /* Address/Count changed */
- dmamode_t dma_mode; /* DMA mode */
+ unsigned int dma_mode; /* DMA mode */
int speed; /* DMA speed */
unsigned int lock; /* Device is allocated */