diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
| commit | 68083e05d72d94f347293d8cc0067050ba904bfa (patch) | |
| tree | 842e71365bd90866be7add181661a4039d891564 /arch/arm/plat-omap/dma.c | |
| parent | 7baac8b91f9871ba8cb09af84de4ae1d86d07812 (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge commit 'v2.6.26-rc9' into cpus4096
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) | |||
| 501 | 501 | ||
| 502 | /* Enable some nice interrupts. */ | 502 | /* Enable some nice interrupts. */ |
| 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; | 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; |
| 504 | |||
| 505 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | ||
| 506 | } | 504 | } |
| 507 | 505 | ||
| 508 | static void omap_disable_channel_irq(int lch) | 506 | static void omap_disable_channel_irq(int lch) |