aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/include/asm/dma.h7
-rw-r--r--arch/arm/include/asm/mach/dma.h2
-rw-r--r--arch/arm/kernel/dma.c2
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 59f59c6c79f7..7edf3536df24 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -22,11 +22,6 @@
22#include <mach/isa-dma.h> 22#include <mach/isa-dma.h>
23 23
24/* 24/*
25 * DMA modes
26 */
27typedef unsigned int dmamode_t;
28
29/*
30 * The DMA modes reflect the settings for the ISA DMA controller 25 * The DMA modes reflect the settings for the ISA DMA controller
31 */ 26 */
32#define DMA_MODE_MASK 0xcc 27#define DMA_MODE_MASK 0xcc
@@ -125,7 +120,7 @@ extern void set_dma_count(unsigned int chan, unsigned long count);
125 * DMA transfer direction immediately, but defer it to the 120 * DMA transfer direction immediately, but defer it to the
126 * enable_dma(). 121 * enable_dma().
127 */ 122 */
128extern void set_dma_mode(unsigned int chan, dmamode_t mode); 123extern void set_dma_mode(unsigned int chan, unsigned int mode);
129 124
130/* Set the transfer speed for this channel 125/* Set the transfer speed for this channel
131 */ 126 */
diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
index 3122adae80be..5166145d8a3c 100644
--- a/arch/arm/include/asm/mach/dma.h
+++ b/arch/arm/include/asm/mach/dma.h
@@ -34,7 +34,7 @@ struct dma_struct {
34 unsigned int active:1; /* Transfer active */ 34 unsigned int active:1; /* Transfer active */
35 unsigned int invalid:1; /* Address/Count changed */ 35 unsigned int invalid:1; /* Address/Count changed */
36 36
37 dmamode_t dma_mode; /* DMA mode */ 37 unsigned int dma_mode; /* DMA mode */
38 int speed; /* DMA speed */ 38 int speed; /* DMA speed */
39 39
40 unsigned int lock; /* Device is allocated */ 40 unsigned int lock; /* Device is allocated */
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index e7828fcd9544..7d5b9fb01e71 100644
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -171,7 +171,7 @@ EXPORT_SYMBOL(set_dma_count);
171 171
172/* Set DMA direction mode 172/* Set DMA direction mode
173 */ 173 */
174void set_dma_mode (unsigned int chan, dmamode_t mode) 174void set_dma_mode (unsigned int chan, unsigned int mode)
175{ 175{
176 dma_t *dma = dma_channel(chan); 176 dma_t *dma = dma_channel(chan);
177 177