diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 18:49:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 18:49:42 -0700 |
| commit | 112ccff716ae74ffa5f30266b29c4d72aab4074b (patch) | |
| tree | f6d5cbe0835975d4920f77a8511e874290071a1b /drivers | |
| parent | sgy-cts1000: Remove __dev* attributes (diff) | |
| parent | hwmon: (lm75) Fix tcn75 prefix (diff) | |
| download | linux-dev-112ccff716ae74ffa5f30266b29c4d72aab4074b.tar.xz linux-dev-112ccff716ae74ffa5f30266b29c4d72aab4074b.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (lm75) Fix tcn75 prefix
hwmon: (lm75.h) Update header inclusion
MAINTAINERS: Remove Mark M. Hoffman
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/lm75.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h index 668ff4721323..5cde94e56f17 100644 --- a/drivers/hwmon/lm75.h +++ b/drivers/hwmon/lm75.h @@ -25,7 +25,7 @@ which contains this code, we don't worry about the wasted space. */ -#include <linux/hwmon.h> +#include <linux/kernel.h> /* straight from the datasheet */ #define LM75_TEMP_MIN (-55000) |