Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index d41ccb56146ace0077cf09b2add2a5c6209a266b..24489da701e331b1a4d1810b40afd7209775e265 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -32,7 +32,10 @@ struct led_classdev {
        int                      brightness;
        int                      flags;
 
+       /* Lower 16 bits reflect status */
 #define LED_SUSPENDED          (1 << 0)
+       /* Upper 16 bits reflect control information */
+#define LED_CORE_SUSPENDRESUME (1 << 16)
 
        /* Set LED brightness level */
        /* Must not sleep, use a workqueue if needed */
@@ -62,7 +65,7 @@ struct led_classdev {
 
 extern int led_classdev_register(struct device *parent,
                                 struct led_classdev *led_cdev);
-extern void led_classdev_unregister(struct led_classdev *lcd);
+extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 
@@ -123,7 +126,7 @@ extern void ledtrig_ide_activity(void);
  */
 struct led_info {
        const char      *name;
-       char            *default_trigger;
+       const char      *default_trigger;
        int             flags;
 };
 
@@ -135,7 +138,7 @@ struct led_platform_data {
 /* For the leds-gpio driver */
 struct gpio_led {
        const char *name;
-       char *default_trigger;
+       const char *default_trigger;
        unsigned        gpio;
        u8              active_low;
 };