Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 0f19df9e37b0..61e0340a4b77 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -145,6 +145,9 @@ extern void led_trigger_register_simple(const char *name,
 extern void led_trigger_unregister_simple(struct led_trigger *trigger);
 extern void led_trigger_event(struct led_trigger *trigger,
                                 enum led_brightness event);
+extern void led_trigger_blink(struct led_trigger *trigger,
+                              unsigned long *delay_on,
+                              unsigned long *delay_off);
 
 #else
 
@@ -194,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);