diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/hwmon/i5k_amb.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/hwmon/i5k_amb.c')
| -rw-r--r-- | drivers/hwmon/i5k_amb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index a18882cc073d..46141abaafba 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c | |||
| @@ -21,12 +21,10 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/jiffies.h> | ||
| 25 | #include <linux/hwmon.h> | 24 | #include <linux/hwmon.h> |
| 26 | #include <linux/hwmon-sysfs.h> | 25 | #include <linux/hwmon-sysfs.h> |
| 27 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 28 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 29 | #include <linux/delay.h> | ||
| 30 | #include <linux/log2.h> | 28 | #include <linux/log2.h> |
| 31 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 32 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |