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

[firefly-linux-kernel-4.4.55.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 24489da701e331b1a4d1810b40afd7209775e265..376fe07732ea9261dc81f3ff7411d49ac9051fb3 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -30,6 +30,7 @@ enum led_brightness {
 struct led_classdev {
        const char              *name;
        int                      brightness;
+       int                      max_brightness;
        int                      flags;
 
        /* Lower 16 bits reflect status */
@@ -140,7 +141,8 @@ struct gpio_led {
        const char *name;
        const char *default_trigger;
        unsigned        gpio;
-       u8              active_low;
+       u8              active_low : 1;
+       u8              retain_state_suspended : 1;
 };
 
 struct gpio_led_platform_data {