Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_h2.c b/drivers/video/omap/lcd_h2.c
index 7d16b5703c95dd29fea9589d4db2d0cf88294d58..96b4816f6489ca3c5af12e16c84a65a17919cab9 100644 (file)
--- a/drivers/video/omap/lcd_h2.c
+++ b/drivers/video/omap/lcd_h2.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/spi/tsc2101.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
 
 static struct {
        struct platform_device  *lcd_dev;