diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:21:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:21:01 -0800 |
| commit | b2d959173fea3e04229b2ff33473b5a031669f66 (patch) | |
| tree | 3c034551b406c8e8b20deeb0197273e06017c11b /arch/arm/plat-omap | |
| parent | ccaae273c3f92d7e7acb796d6747077a93dcca4b (diff) | |
| parent | 1daa8c1d75876f690ed8d3f13c806034af5984eb (diff) | |
Merge branch 'omap-fixes' into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 09d82b3c66c..728c6420418 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -1183,7 +1183,7 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) } if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || - (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { + (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) { printk(KERN_ERR "omap_dma: You need to stop the DMA channels " "before unlinking\n"); dump_stack(); diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 9a028bdebb0..a162f585b1e 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -434,6 +434,7 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES2_1 0x34302034 #define OMAP3430_REV_ES3_0 0x34303034 #define OMAP3430_REV_ES3_1 0x34304034 +#define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 |