Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_p2.c b/drivers/video/omap/lcd_p2.c
index b0a0af8bf206350469487b64404621600c5991f4..8c66bf635d680371639faa0fb98e1af2295a5fad 100644 (file)
--- a/drivers/video/omap/lcd_p2.c
+++ b/drivers/video/omap/lcd_p2.c
@@ -25,9 +25,9 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 /*
  * File: epson-md-tft.h