From 15dd343a07e7d747983b5ab0e23bf14940f8da84 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 2 Jan 2009 12:34:55 +0000
Subject: [PATCH] --- yaml --- r: 137172 b: refs/heads/master c:
 f0ffc816250a8cc28e6824326e2d58333e058eca h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/include/asm/dma.h      | 7 +------
 trunk/arch/arm/include/asm/mach/dma.h | 2 +-
 trunk/arch/arm/kernel/dma.c           | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9d696792dc66..519cb0a68aeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e57ea9a2e8e807e20f64d5b53fbee2c7c9e87ae
+refs/heads/master: f0ffc816250a8cc28e6824326e2d58333e058eca
diff --git a/trunk/arch/arm/include/asm/dma.h b/trunk/arch/arm/include/asm/dma.h
index 59f59c6c79f7..7edf3536df24 100644
--- a/trunk/arch/arm/include/asm/dma.h
+++ b/trunk/arch/arm/include/asm/dma.h
@@ -21,11 +21,6 @@
 
 #include <mach/isa-dma.h>
 
-/*
- * DMA modes
- */
-typedef unsigned int dmamode_t;
-
 /*
  * The DMA modes reflect the settings for the ISA DMA controller
  */
@@ -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/trunk/arch/arm/include/asm/mach/dma.h b/trunk/arch/arm/include/asm/mach/dma.h
index 3122adae80be..5166145d8a3c 100644
--- a/trunk/arch/arm/include/asm/mach/dma.h
+++ b/trunk/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		*/
diff --git a/trunk/arch/arm/kernel/dma.c b/trunk/arch/arm/kernel/dma.c
index e7828fcd9544..7d5b9fb01e71 100644
--- a/trunk/arch/arm/kernel/dma.c
+++ b/trunk/arch/arm/kernel/dma.c
@@ -171,7 +171,7 @@ EXPORT_SYMBOL(set_dma_count);
 
 /* Set DMA direction mode
  */
-void set_dma_mode (unsigned int chan, dmamode_t mode)
+void set_dma_mode (unsigned int chan, unsigned int mode)
 {
 	dma_t *dma = dma_channel(chan);