Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de551e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v3.18-rc2' of... 

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
parents eb0c5ff6 3d596047

drivers/hwmon/menf21bmc_hwmon.c

+1 −0
Original line number Diff line number Diff line
@@ -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"