Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
index 8311cac19e242f60fe2cf3c6af2ebfdebd13a57b..8a0105e3520d5bfbfc21f5f81f675fbbf5608a26 100644 (file)
--- a/drivers/video/omap/lcd_omap2evm.c
+++ b/drivers/video/omap/lcd_omap2evm.c
@@ -25,9 +25,9 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/twl4030.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
 #include <asm/mach-types.h>
 
 #define LCD_PANEL_ENABLE_GPIO  154