diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/hwmon/sht15.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/hwmon/sht15.c')
| -rw-r--r-- | drivers/hwmon/sht15.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index 864a371f6eb..6b2d8ae64fe 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -36,6 +36,7 @@ #include <linux/err.h> #include <linux/sht15.h> #include <linux/regulator/consumer.h> +#include <linux/slab.h> #include <asm/atomic.h> #define SHT15_MEASURE_TEMP 3 |