Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/leds/leds-omap.c b/drivers/leds/leds-omap.c
index 040b7e41d847116400b11d72fd973665905ae5ec..5c14c4b5275250bab543fea2d1d6f000b0038fa5 100644 (file)
--- a/drivers/leds/leds-omap.c
+++ b/drivers/leds/leds-omap.c
@@ -15,9 +15,9 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/led.h>
+#include <mach/gpio.h>
+#include <mach/hardware.h>
+#include <mach/led.h>
 
 /* our context */