From: Tony Lindgren <tony@atomide.com>
Date: Tue, 3 Jun 2008 17:30:15 +0000 (-0700)
Subject: ARM: OMAP: Rename DMA end_type to be omap specific
X-Git-Tag: v2.6.26-omap1~123^2~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f4c1d95bb765f4408649901c192ad11cc118244;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Rename DMA end_type to be omap specific

Also remove a space to shrink diff with mainline dma.h

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index ee8e607528b..9819f3945b5 100644
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -210,7 +210,6 @@
 
 /* DMA channels for 24xx */
 #define OMAP24XX_DMA_NO_DEVICE		0
-
 #define OMAP24XX_DMA_XTI_DMA		1	/* S_DMA_0 */
 #define OMAP24XX_DMA_EXT_DMAREQ0	2	/* S_DMA_1 */
 #define OMAP24XX_DMA_EXT_DMAREQ1	3	/* S_DMA_2 */
@@ -415,8 +414,8 @@ enum omap_dma_burst_mode {
 };
 
 enum end_type {
-	LITTLE_ENDIAN = 0,
-	BIG_ENDIAN
+	OMAP_DMA_LITTLE_ENDIAN = 0,
+	OMAP_DMA_BIG_ENDIAN
 };
 
 enum omap_dma_color_mode {