Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 3af8b2fd9714311e45f1a7e99a41a4957a842c19..1895997d8d8e0eed1a322558eed77bbaccd6126a 100644 (file)
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -23,8 +23,8 @@
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 
-#include <asm/arch/omapfb.h>
-#include <asm/arch/lcd_mipid.h>
+#include <mach/omapfb.h>
+#include <mach/lcd_mipid.h>
 
 #include "../../cbus/tahvo.h"