summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-24 00:56:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-24 00:56:24 +0400
commit5de551e0eeddf470928e9fee59825a3645641bc7 (patch)
treed795f5003741709f0c218a5cce58ed96853de6f3 /drivers
parenteb0c5ff6f3f12e717ecb0392b137884e40bb32bd (diff)
parent3d5960472de0a245c56ba55e9a59b8d0f4c69cb4 (diff)
downloadlinux-5de551e0eeddf470928e9fee59825a3645641bc7.tar.xz
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.c1
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"