Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

[linux-2.6-omap-h63xx.git] / drivers / video / omap / hwa742.c

diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index dc48e02f215c4b2fad5944589f319aaac6521254..f24df0b54e1cad0ff54ab68d5439b99fd8ae03c0 100644 (file)
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -26,9 +26,9 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/hwa742.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/hwa742.h>
 
 #define HWA742_REV_CODE_REG       0x0
 #define HWA742_CONFIG_REG         0x2
@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi,
        if (unlikely(win->format &
            ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE |
            OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) {
-               dev_dbg(hwa742.fbdev->dev, "invalid window flag");
+               dev_dbg(hwa742.fbdev->dev, "invalid window flag\n");
                r = -EINVAL;
                goto out;
        }