Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[pandora-kernel.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 383811d..5884def 100644 (file)
--- 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
 
@@ -204,5 +207,7 @@ struct gpio_led_platform_data {
                                        unsigned long *delay_off);
 };
 
+struct platform_device *gpio_led_register_device(
+               int id, const struct gpio_led_platform_data *pdata);
 
 #endif         /* __LINUX_LEDS_H_INCLUDED */