Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 3476689467d3033c7e66099f5cc98e5cf15d075b..3fd5342d645c9195233635d9a20ae83e2605d73e 100644 (file)
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -28,9 +28,9 @@
 #include <asm/delay.h>
 #include <asm/io.h>
 
-#include <asm/arch/board-ams-delta.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/omapfb.h>
+#include <mach/board-ams-delta.h>
+#include <mach/hardware.h>
+#include <mach/omapfb.h>
 
 #define AMS_DELTA_DEFAULT_CONTRAST     112