Merge branch 'linus' into core/urgent

[linux-2.6-block.git] / include / linux / led-lm3530.h

diff --git a/include/linux/led-lm3530.h b/include/linux/led-lm3530.h
index 58592fa67d24ae23ba7ba18d364ae2c7e206a3b2..8eb12357a1105d7818b1cf40434297f03e007fbb 100644 (file)
--- a/include/linux/led-lm3530.h
+++ b/include/linux/led-lm3530.h
@@ -84,6 +84,8 @@ enum lm3530_als_mode {
  * @brt_ramp_rise: rate of rise of led current
  * @als1_resistor_sel: internal resistance from ALS1 input to ground
  * @als2_resistor_sel: internal resistance from ALS2 input to ground
+ * @als_vmin: als input voltage calibrated for max brightness in mV
+ * @als_vmax: als input voltage calibrated for min brightness in mV
  * @brt_val: brightness value (0-255)
  */
 struct lm3530_platform_data {
@@ -101,6 +103,9 @@ struct lm3530_platform_data {
        u8 als1_resistor_sel;
        u8 als2_resistor_sel;
 
+       u32 als_vmin;
+       u32 als_vmax;
+
        u8 brt_val;
 };