diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-23 07:58:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-23 07:59:03 +0100 |
| commit | d3571faa1ba899f2459ee3616d702e7b07b9c996 (patch) | |
| tree | 9a0c6e01eecbd5bb11afa1e8f294f7a073742ada /include/uapi/linux | |
| parent | 362a7993ed0173e70859d0a624d8ffa968b2cea0 (diff) | |
| parent | 4bbf9020becbfd8fc2c3da790855b7042fad455b (diff) | |
Merge 6.14-rc4 into usb-next
We need the USB fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/thermal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/thermal.h b/include/uapi/linux/thermal.h index ba8604bdf206..349718c271eb 100644 --- a/include/uapi/linux/thermal.h +++ b/include/uapi/linux/thermal.h @@ -3,8 +3,8 @@ #define _UAPI_LINUX_THERMAL_H #define THERMAL_NAME_LENGTH 20 -#define THERMAL_THRESHOLD_WAY_UP BIT(0) -#define THERMAL_THRESHOLD_WAY_DOWN BIT(1) +#define THERMAL_THRESHOLD_WAY_UP 0x1 +#define THERMAL_THRESHOLD_WAY_DOWN 0x2 enum thermal_device_mode { THERMAL_DEVICE_DISABLED = 0, |