Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index ffd5c3d911933bd8a4f48d7374467aedb4215cbc..61e0340a4b770c3675787130afdc8174eb902262 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -197,11 +197,11 @@ struct gpio_led {
 
 struct gpio_led_platform_data {
        int             num_leds;
-       struct gpio_led *leds;
+       const struct gpio_led *leds;
 
 #define GPIO_LED_NO_BLINK_LOW  0       /* No blink GPIO state low */
 #define GPIO_LED_NO_BLINK_HIGH 1       /* No blink GPIO state high */
-#define GPIO_LED_BLINK         2       /* Plase, blink */
+#define GPIO_LED_BLINK         2       /* Please, blink */
        int             (*gpio_blink_set)(unsigned gpio, int state,
                                        unsigned long *delay_on,
                                        unsigned long *delay_off);