diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
| commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
| tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /drivers/hwmon/menf21bmc_hwmon.c | |
| parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff) | |
| parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 (diff) | |
| download | blackbird-op-linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.gz blackbird-op-linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.zip | |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'drivers/hwmon/menf21bmc_hwmon.c')
| -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" |
