diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-06-22 15:03:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-22 15:03:20 +0100 |
| commit | c907310fb0a5dd69a7fe11c08368abb0d34a35cb (patch) | |
| tree | 77eb423abe1d1ce2fdf6349e28f0a33289bf3920 | |
| parent | e5a2c9ccb3e849fed70674ac6880536eaf553dba (diff) | |
| parent | 15e02a3b510aa4ef3d077ebc25eb3cd08b9af034 (diff) | |
| download | talos-op-linux-c907310fb0a5dd69a7fe11c08368abb0d34a35cb.tar.gz talos-op-linux-c907310fb0a5dd69a7fe11c08368abb0d34a35cb.zip | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 02cede295e89..dbf68dc50ae2 100644 --- 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 diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c00eda588cd8..39c637b0ffea 100644 --- 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) |
