Monday 16 November 2009 23:25:18 Tony Lindgren napisał(a): > * Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx> [091116 20:40]: > > The patch corrects the issue introduced with my previous patch: > > "OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set" > > as pointed out by OMAP subsystem maintainer. > > > > Created and tested against linux-omap for-next, > > commit 155a75d9725e66e5ec8a383822957dee52427057 > > Oops, looks like this needs one more update. This breaks building > for mach-omap2 machines: > > arch/arm/plat-omap/dma.c: In function 'omap_dma_running': > arch/arm/plat-omap/dma.c:1132: error: 'OMAP_LCDC_CONTROL' undeclared (first > use in this function) arch/arm/plat-omap/dma.c:1132: error: (Each > undeclared identifier is reported only once arch/arm/plat-omap/dma.c:1132: > error: for each function it appears in.) arch/arm/plat-omap/dma.c:1132: > error: 'OMAP_LCDC_CTRL_LCD_EN' undeclared (first use in this function) > > So removing from omap for-next. [snip] > > if (cpu_is_omap1510()) > > - if (omap_readw(0xfffec000 + 0x00) & (1 << 0)) > > + if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN) > > return 1; > > Sorry, I was sure it would be optimized out by a compiler. I'll put that into #ifdef block then. Thanks, Janusz -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
