diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 10:26:38 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 10:26:38 +0000 |
commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
tree | a091be1024bd76627f78e791e377126e47703b7b /include/linux/thermal.h | |
parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'include/linux/thermal.h')
-rw-r--r-- | include/linux/thermal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index c611a02fbc5..fc52e307efa 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -38,7 +38,7 @@ #define THERMAL_CSTATE_INVALID -1UL /* No upper/lower limit requirement */ -#define THERMAL_NO_LIMIT THERMAL_CSTATE_INVALID +#define THERMAL_NO_LIMIT ((u32)~0) /* Unit conversion macros */ #define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \ |