Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
index 8ba15dceb9253551ff9ab65dfb9bb9f608e6a68c..9af6cd0a963b9bd1224d97e0da7698edd0b2ef35 100644 (file)
--- a/drivers/video/omap/lcd_2430sdp.c
+++ b/drivers/video/omap/lcd_2430sdp.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 SDP2430_LCD_PANEL_BACKLIGHT_GPIO       91