diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-23 13:56:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-23 13:56:24 -0700 |
| commit | 5de551e0eeddf470928e9fee59825a3645641bc7 (patch) | |
| tree | d795f5003741709f0c218a5cce58ed96853de6f3 /drivers | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | hwmon: (menf21bmc) Include linux/err.h (diff) | |
| download | linux-dev-5de551e0eeddf470928e9fee59825a3645641bc7.tar.xz linux-dev-5de551e0eeddf470928e9fee59825a3645641bc7.zip | |
Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull a hwmon fix from Guenter Roeck:
"Fix potential compile problem for menf21bmc hwmon driver"
* tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (menf21bmc) Include linux/err.h
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/menf21bmc_hwmon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/menf21bmc_hwmon.c b/drivers/hwmon/menf21bmc_hwmon.c index c92229d321c9..afc6b58eaa62 100644 --- a/drivers/hwmon/menf21bmc_hwmon.c +++ b/drivers/hwmon/menf21bmc_hwmon.c @@ -21,6 +21,7 @@ #include <linux/jiffies.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/err.h> #define DRV_NAME "menf21bmc_hwmon" |