diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:39:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:39:56 -0400 |
| commit | 234a56c80a6aa7a05fec05d8b7184354d8765b48 (patch) | |
| tree | 12f8a05b005ced034316a8c865b51cdbe3f79802 /include/linux/platform_data | |
| parent | a57f14bac07f63118d947f53976d7f15c04b062a (diff) | |
| parent | 761c1770f2bf36a323ab97e2e1780db4f9b8a6fe (diff) | |
Merge tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- new driver for Microchip TC74
- support for ncpXXwf104 added to ntc_thermistor driver
- minor cleanup
* tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: add driver for Microchip TC74
hwmon: (ntc_thermistor) Improve precision of resistance calculation
hwmon: (ntc_thermistor) fix iio raw to microvolts conversion
hwmon: (atxp1) Drop auto-detection
hwmon: (atxp1) Drop FSF mailing address
hwmon: Allow compile test of GPIO consumers if !GPIOLIB
hwmon: (sht15) Constify platform_device_id
hwmon: (max197) Constify platform_device_id
hwmon: (ntc_thermistor) Add support for ncpXXwf104
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/ntc_thermistor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h index 0a6de4ca4930..aed170588b74 100644 --- a/include/linux/platform_data/ntc_thermistor.h +++ b/include/linux/platform_data/ntc_thermistor.h | |||
| @@ -27,6 +27,7 @@ enum ntc_thermistor_type { | |||
| 27 | TYPE_NCPXXWB473, | 27 | TYPE_NCPXXWB473, |
| 28 | TYPE_NCPXXWL333, | 28 | TYPE_NCPXXWL333, |
| 29 | TYPE_B57330V2103, | 29 | TYPE_B57330V2103, |
| 30 | TYPE_NCPXXWF104, | ||
| 30 | }; | 31 | }; |
| 31 | 32 | ||
| 32 | struct ntc_thermistor_platform_data { | 33 | struct ntc_thermistor_platform_data { |