Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

c907310f · Russell King · Russell King · e5a2c9cc · 15e02a3b · c907310f
Commit c907310f authored Jun 22, 2008 by Russell King Committed by Russell King Jun 22, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/gpmc.c +1 -1

arch/arm/plat-omap/dma.c arch/arm/plat-omap/dma.c +0 -2

No files found.
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -42,7 +42,7 @@
 #define GPMC_STATUS		0x54
 #define GPMC_PREFETCH_CONFIG1	0x1e0
 #define GPMC_PREFETCH_CONFIG2	0x1e4
-#define GPMC_PREFETCH_CONTROL	0x1e8
+#define GPMC_PREFETCH_CONTROL	0x1ec
 #define GPMC_PREFETCH_STATUS	0x1f0
 #define GPMC_ECC_CONFIG		0x1f4
 #define GPMC_ECC_CONTROL	0x1f8

--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch)

 	/* Enable some nice interrupts. */
 	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;
-
-	dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
 }

 static void omap_disable_channel_irq(int lch)