Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index 82571eef1f702e298e259205b9c2f8346dc1a9b3..6031b89573b236791e2fbbff80c8753429c6bdf4 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"