diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 15:31:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 15:31:50 -0700 |
| commit | a00da40fc7a4f5000302d003dd469f132f7dfa55 (patch) | |
| tree | 2d5d2f6fc5fed1da888baaf75eb61e593d37e248 /include | |
| parent | 4a01fa5e7506ec5e9537fbd0fb87faa14f4bded3 (diff) | |
| parent | a2125d02443e9a4e68bcfd9f8004fa23239e8329 (diff) | |
| download | linux-a00da40fc7a4f5000302d003dd469f132f7dfa55.tar.bz2 | |
Merge tag 'hwmon-for-linus-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- bug fixes in asus_atk0110, it87 and max31790 drivers
- added missing API definition to hwmon core
* tag 'hwmon-for-linus-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (asus_atk0110) fix uninitialized data access
hwmon: Add missing HWMON_T_ALARM
hwmon: (it87) Avoid registering the same chip on both SIO addresses
hwmon: (max31790) Set correct PWM value
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hwmon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index 78d59dba563e..88b673749121 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h @@ -88,6 +88,7 @@ enum hwmon_temp_attributes { #define HWMON_T_CRIT_HYST BIT(hwmon_temp_crit_hyst) #define HWMON_T_EMERGENCY BIT(hwmon_temp_emergency) #define HWMON_T_EMERGENCY_HYST BIT(hwmon_temp_emergency_hyst) +#define HWMON_T_ALARM BIT(hwmon_temp_alarm) #define HWMON_T_MIN_ALARM BIT(hwmon_temp_min_alarm) #define HWMON_T_MAX_ALARM BIT(hwmon_temp_max_alarm) #define HWMON_T_CRIT_ALARM BIT(hwmon_temp_crit_alarm) |