diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:19:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:19:32 +0300 |
| commit | e47ff590cc57a3468c1f77e5f2494bbaefdd4371 (patch) | |
| tree | 7c71b3832c0d805b0ee6daa1aaaa50326b65654f /include/linux/hwmon.h | |
| parent | 2e58cafa0bbde529a9f44300382f60f6ce46d7d2 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-e47ff590cc57a3468c1f77e5f2494bbaefdd4371.tar.xz | |
Merge 4.11-rc4 into usb-next
This resolves a merge issue in the gadget code, and we want the USB
fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hwmon.h')
| -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) |