Skip to content

L
linux-davinci
Commit c907310f authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

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

parents e5a2c9cc 15e02a3b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
arch/arm/mach-omap2/gpmc.c
View file @ c907310f
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define GPMC_STATUS 0x54 #define GPMC_STATUS 0x54
#define GPMC_PREFETCH_CONFIG1 0x1e0 #define GPMC_PREFETCH_CONFIG1 0x1e0
#define GPMC_PREFETCH_CONFIG2 0x1e4 #define GPMC_PREFETCH_CONFIG2 0x1e4
#define GPMC_PREFETCH_CONTROL 0x1e8 #define GPMC_PREFETCH_CONTROL 0x1ec
#define GPMC_PREFETCH_STATUS 0x1f0 #define GPMC_PREFETCH_STATUS 0x1f0
#define GPMC_ECC_CONFIG 0x1f4 #define GPMC_ECC_CONFIG 0x1f4
#define GPMC_ECC_CONTROL 0x1f8 #define GPMC_ECC_CONTROL 0x1f8
......
arch/arm/plat-omap/dma.c
View file @ c907310f
...@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch) ...@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch)
/* Enable some nice interrupts. */ /* Enable some nice interrupts. */
OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; 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) static void omap_disable_channel_irq(int lch)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment