lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King
2008-06-22 15:03:20 +01:00
committed by Russell King
parent e5a2c9ccb3 15e02a3b51
commit c907310fb0
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/gpmc.c
View File

@@ -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

2
arch/arm/plat-omap/dma.c
View File

@@ -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)