V4L/DVB (9074): gspca: sonixj webcam 0c45:60fe added.

[safe/jmp/linux-2.6] / drivers / video / omap / blizzard.c

diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index e682940..9dfcf39 100644 (file)
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.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/blizzard.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/blizzard.h>
 
 #include "dispc.h"
 
@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void)
        while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) {
                if (time_after(jiffies, tmo)) {
                        dev_err(blizzard.fbdev->dev,
-                                       "s1d1374x: SDRAM not ready");
+                                       "s1d1374x: SDRAM not ready\n");
                        break;
                }
                msleep(1);