diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 11:46:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 11:46:45 -0700 |
| commit | b43f9b59e65e1d4ff06474885b44515817868fdd (patch) | |
| tree | 0de0ca983a6624b0582034154da4d17a170caf1e /drivers/hwmon | |
| parent | c37b95eeefee32a765a9bbbfeaece48a361b2d23 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | blackbird-op-linux-b43f9b59e65e1d4ff06474885b44515817868fdd.tar.gz blackbird-op-linux-b43f9b59e65e1d4ff06474885b44515817868fdd.zip | |
Merge 3.9-rc5 into staging-next
This pulls in all of the good fixes we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/lm75.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h index 668ff4721323..5cde94e56f17 100644 --- a/drivers/hwmon/lm75.h +++ b/drivers/hwmon/lm75.h @@ -25,7 +25,7 @@ which contains this code, we don't worry about the wasted space. */ -#include <linux/hwmon.h> +#include <linux/kernel.h> /* straight from the datasheet */ #define LM75_TEMP_MIN (-55000) |
