Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/backlight/omap_bl.c b/drivers/video/backlight/omap_bl.c
index 2072f28578f2875cb3df94bc85a29050e0af8391..eb9b5ba38c148b1d193c36dadc945d978a4dbab9 100644 (file)
--- a/drivers/video/backlight/omap_bl.c
+++ b/drivers/video/backlight/omap_bl.c
@@ -27,9 +27,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/board.h>
+#include <mach/mux.h>
 
 #define OMAPBL_MAX_INTENSITY           0xff