Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 21 insertions, 0 deletions

diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
new file mode 100644
index 000000000000..33a071167489
--- /dev/null
+++ b/include/linux/leds_pwm.h
@@ -0,0 +1,21 @@
+/*
+ * PWM LED driver data - see drivers/leds/leds-pwm.c
+ */
+#ifndef __LINUX_LEDS_PWM_H
+#define __LINUX_LEDS_PWM_H
+
+struct led_pwm {
+        const char      *name;
+        const char      *default_trigger;
+        unsigned        pwm_id;
+        u8              active_low;
+        unsigned        max_brightness;
+        unsigned        pwm_period_ns;
+};
+
+struct led_pwm_platform_data {
+        int                     num_leds;
+        struct led_pwm  *leds;
+};
+
+#endif