Commit c907310f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents e5a2c9cc 15e02a3b

arch/arm/mach-omap2/gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-omap/dma.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE