Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

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

diff --git a/include/linux/sht15.h b/include/linux/sht15.h
index 046bce0..f85c7c5 100644 (file)
--- a/include/linux/sht15.h
+++ b/include/linux/sht15.h
@@ -8,17 +8,27 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
+ *
+ * For further information, see the Documentation/hwmon/sht15 file.
  */
 
 /**
  * struct sht15_platform_data - sht15 connectivity info
- * @gpio_data: no. of gpio to which bidirectional data line is connected
- * @gpio_sck:  no. of gpio to which the data clock is connected.
- * @supply_mv: supply voltage in mv. Overridden by regulator if available.
- **/
+ * @gpio_data:         no. of gpio to which bidirectional data line is
+ *                     connected.
+ * @gpio_sck:          no. of gpio to which the data clock is connected.
+ * @supply_mv:         supply voltage in mv. Overridden by regulator if
+ *                     available.
+ * @checksum:          flag to indicate the checksum should be validated.
+ * @no_otp_reload:     flag to indicate no reload from OTP.
+ * @low_resolution:    flag to indicate the temp/humidity resolution to use.
+ */
 struct sht15_platform_data {
        int gpio_data;
        int gpio_sck;
        int supply_mv;
+       bool checksum;
+       bool no_otp_reload;
+       bool low_resolution;
 };