Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / leds / leds-omap-pwm.c

diff --git a/drivers/leds/leds-omap-pwm.c b/drivers/leds/leds-omap-pwm.c
index 1aecd4f1ac643ccaf2084bd8ed2372831a80efd0..57eb38359f3310fa4cd3e89c5503f0bcaec06cf2 100644 (file)
--- a/drivers/leds/leds-omap-pwm.c
+++ b/drivers/leds/leds-omap-pwm.c
@@ -18,8 +18,8 @@
 #include <linux/ctype.h>
 #include <linux/sched.h>
 #include <asm/delay.h>
-#include <asm/arch/board.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/board.h>
+#include <mach/dmtimer.h>
 
 struct omap_pwm_led {
        struct led_classdev cdev;