diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
| commit | e626d177fcb7d8eb759da49c652a68ff90a59fba (patch) | |
| tree | 6223d17d7601212c51d223657d273d6e7bc0807a /drivers/hwmon/emc1403.c | |
| parent | df632d3ce7eacf92ad9b642301c7b53a1d95b8d8 (diff) | |
| parent | 0657777fcefffbf79d4a5fa0952a3f1a4248c0da (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"Only trivial things this time"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Drop needless includes of <linux/delay.h>
hwmon: Add missing inclusions of <linux/err.h>
hwmon: Add missing inclusions of <linux/jiffies.h>
hwmon: Fix spelling of Celsius
hwmon: Update Alexey Fisher's name
Diffstat (limited to 'drivers/hwmon/emc1403.c')
| -rw-r--r-- | drivers/hwmon/emc1403.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c index 68ab94bde3f..142e1cb8dea 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/err.h> | 33 | #include <linux/err.h> |
| 34 | #include <linux/sysfs.h> | 34 | #include <linux/sysfs.h> |
| 35 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
| 36 | #include <linux/jiffies.h> | ||
| 36 | 37 | ||
| 37 | #define THERMAL_PID_REG 0xfd | 38 | #define THERMAL_PID_REG 0xfd |
| 38 | #define THERMAL_SMSC_ID_REG 0xfe | 39 | #define THERMAL_SMSC_ID_REG 0xfe |