Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 4e1ba45642996cce3ec8adc79dcb2ef80de9ac42..b4f67fcda15485a43fc677fcaf28653fb73d8ad2 100644 (file)
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -24,8 +24,8 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #include "lcdc.h"