Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap1 / lcd_dma.c

diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c
index 48895140695fe4fde456b1c6ab675ccfc1985547..3be11af687bb26652be53303b17d7d5265568e03 100644 (file)
--- a/arch/arm/mach-omap1/lcd_dma.c
+++ b/arch/arm/mach-omap1/lcd_dma.c
@@ -28,6 +28,7 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
+#include <mach/lcdc.h>
 #include <plat/dma.h>
 
 int omap_lcd_dma_running(void)
@@ -37,7 +38,7 @@ int omap_lcd_dma_running(void)
         * when it gets enabled, so assume DMA running if LCD enabled.
         */
        if (cpu_is_omap1510())
-               if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
+               if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)
                        return 1;
 
        /* Check if LCD DMA is running */