diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-21 13:38:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-21 13:38:46 +0100 |
| commit | 77849059e4212d1dc21159cd8921e4e100324040 (patch) | |
| tree | 96a10fb2d4be29c8f25057c1b4d5deb447836e5a /include/uapi | |
| parent | 472b57159b49a410fef74cd5dd31318c62d5c40d (diff) | |
| parent | 028374da13e72620d1db381c2b3d72680ad02141 (diff) | |
| download | linux-next-77849059e4212d1dc21159cd8921e4e100324040.tar.gz linux-next-77849059e4212d1dc21159cd8921e4e100324040.zip | |
Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
# Conflicts:
# sound/hda/codecs/side-codecs/cs35l41_hda.c
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/thermal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/uapi/linux/thermal.h b/include/uapi/linux/thermal.h index 46a2633d33aa..36f3da2d6a7c 100644 --- a/include/uapi/linux/thermal.h +++ b/include/uapi/linux/thermal.h @@ -81,11 +81,11 @@ enum thermal_genl_event { THERMAL_GENL_EVENT_CDEV_STATE_UPDATE, /* Cdev state updated */ THERMAL_GENL_EVENT_TZ_GOV_CHANGE, /* Governor policy changed */ THERMAL_GENL_EVENT_CPU_CAPABILITY_CHANGE, /* CPU capability changed */ - THERMAL_GENL_EVENT_THRESHOLD_ADD, /* A thresold has been added */ - THERMAL_GENL_EVENT_THRESHOLD_DELETE, /* A thresold has been deleted */ + THERMAL_GENL_EVENT_THRESHOLD_ADD, /* A threshold has been added */ + THERMAL_GENL_EVENT_THRESHOLD_DELETE, /* A threshold has been deleted */ THERMAL_GENL_EVENT_THRESHOLD_FLUSH, /* All thresolds have been deleted */ - THERMAL_GENL_EVENT_THRESHOLD_UP, /* A thresold has been crossed the way up */ - THERMAL_GENL_EVENT_THRESHOLD_DOWN, /* A thresold has been crossed the way down */ + THERMAL_GENL_EVENT_THRESHOLD_UP, /* A threshold has been crossed the way up */ + THERMAL_GENL_EVENT_THRESHOLD_DOWN, /* A threshold has been crossed the way down */ __THERMAL_GENL_EVENT_MAX, }; #define THERMAL_GENL_EVENT_MAX (__THERMAL_GENL_EVENT_MAX - 1) |