- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / arch / arm / mach-omap1 / leds-osk.c

diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 86de303..026685e 100644 (file)
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -5,13 +5,13 @@
  */
 #include <linux/init.h>
 #include <linux/workqueue.h>
+#include <linux/i2c/tps65010.h>
 
 #include <asm/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
 #include <asm/arch/gpio.h>
-#include <asm/arch/tps65010.h>
 
 #include "leds.h"
 
@@ -82,7 +82,7 @@ static void mistral_setled(void)
                red = 1;
        else if (hw_led_state & IDLE_LED)
                green = 1;
-       // else both sides are disabled
+       /* else both sides are disabled */
 
        omap_set_gpio_dataout(GPIO_LED_GREEN, green);
        omap_set_gpio_dataout(GPIO_LED_RED, red);
@@ -112,7 +112,7 @@ void osk_leds_event(led_event_t evt)
        case led_stop:
                led_state &= ~LED_STATE_ENABLED;
                hw_led_state = 0;
-               // NOTE:  work may still be pending!!
+               /* NOTE:  work may still be pending!! */
                break;
 
        case led_claim: