diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 09:41:27 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 09:41:27 +0400 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /drivers/hwmon/hih6130.c | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.xz | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/hih6130.c')
| -rw-r--r-- | drivers/hwmon/hih6130.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c index e8ee75f55472..9a675efaa78d 100644 --- a/drivers/hwmon/hih6130.c +++ b/drivers/hwmon/hih6130.c @@ -33,6 +33,7 @@ #include <linux/mutex.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/jiffies.h> /** * struct hih6130 - HIH-6130 device specific data |