diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
commit | e626d177fcb7d8eb759da49c652a68ff90a59fba (patch) | |
tree | 6223d17d7601212c51d223657d273d6e7bc0807a | |
parent | df632d3ce7eacf92ad9b642301c7b53a1d95b8d8 (diff) | |
parent | 0657777fcefffbf79d4a5fa0952a3f1a4248c0da (diff) |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"Only trivial things this time"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Drop needless includes of <linux/delay.h>
hwmon: Add missing inclusions of <linux/err.h>
hwmon: Add missing inclusions of <linux/jiffies.h>
hwmon: Fix spelling of Celsius
hwmon: Update Alexey Fisher's name
41 files changed, 35 insertions, 17 deletions
diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052 index ef898553638..5bc51346b68 100644 --- a/Documentation/hwmon/da9052 +++ b/Documentation/hwmon/da9052 | |||
@@ -56,6 +56,6 @@ The junction temperature is calculated: | |||
56 | The junction temperature attribute is supported by the driver. | 56 | The junction temperature attribute is supported by the driver. |
57 | 57 | ||
58 | The battery temperature is calculated: | 58 | The battery temperature is calculated: |
59 | Degree Celcius = 1 / (t1 + 1/298)- 273 | 59 | Degree Celsius = 1 / (t1 + 1/298)- 273 |
60 | where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) | 60 | where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) |
61 | Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. | 61 | Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. |
diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619 index d6f8d9cd7d7..e6d87398cc8 100644 --- a/Documentation/hwmon/max1619 +++ b/Documentation/hwmon/max1619 | |||
@@ -9,7 +9,7 @@ Supported chips: | |||
9 | http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf | 9 | http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf |
10 | 10 | ||
11 | Authors: | 11 | Authors: |
12 | Alexey Fisher <fishor@mail.ru>, | 12 | Oleksij Rempel <bug-track@fisher-privat.net>, |
13 | Jean Delvare <khali@linux-fr.org> | 13 | Jean Delvare <khali@linux-fr.org> |
14 | 14 | ||
15 | Description | 15 | Description |
diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon index ef7984317ce..c3a3a5be10a 100644 --- a/Documentation/hwmon/twl4030-madc-hwmon +++ b/Documentation/hwmon/twl4030-madc-hwmon | |||
@@ -41,5 +41,5 @@ Channel Signal | |||
41 | 41 | ||
42 | The Sysfs nodes will represent the voltage in the units of mV, | 42 | The Sysfs nodes will represent the voltage in the units of mV, |
43 | the temperature channel shows the converted temperature in | 43 | the temperature channel shows the converted temperature in |
44 | degree celcius. The Battery charging current channel represents | 44 | degree Celsius. The Battery charging current channel represents |
45 | battery charging current in mA. | 45 | battery charging current in mA. |
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 23ab3c496b0..1672e2a5db4 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
31 | #include <linux/time.h> | 31 | #include <linux/time.h> |
32 | #include <linux/err.h> | ||
32 | #include <acpi/acpi_drivers.h> | 33 | #include <acpi/acpi_drivers.h> |
33 | #include <acpi/acpi_bus.h> | 34 | #include <acpi/acpi_bus.h> |
34 | 35 | ||
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c index 8b24d1a4a2b..dafa477715e 100644 --- a/drivers/hwmon/adm9240.c +++ b/drivers/hwmon/adm9240.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/hwmon-vid.h> | 50 | #include <linux/hwmon-vid.h> |
51 | #include <linux/err.h> | 51 | #include <linux/err.h> |
52 | #include <linux/mutex.h> | 52 | #include <linux/mutex.h> |
53 | #include <linux/jiffies.h> | ||
53 | 54 | ||
54 | /* Addresses to scan */ | 55 | /* Addresses to scan */ |
55 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | 56 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, |
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index fe72c69a2d6..517f1856c70 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/delay.h> | ||
19 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
20 | #include <linux/jiffies.h> | 19 | #include <linux/jiffies.h> |
21 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c index baee482aedf..98a7d81e25c 100644 --- a/drivers/hwmon/adt7462.c +++ b/drivers/hwmon/adt7462.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/hwmon-sysfs.h> | 26 | #include <linux/hwmon-sysfs.h> |
27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
29 | #include <linux/delay.h> | ||
30 | #include <linux/log2.h> | 29 | #include <linux/log2.h> |
31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
32 | 31 | ||
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c index 861c756e953..989e54c3925 100644 --- a/drivers/hwmon/adt7475.c +++ b/drivers/hwmon/adt7475.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/hwmon-sysfs.h> | 20 | #include <linux/hwmon-sysfs.h> |
21 | #include <linux/hwmon-vid.h> | 21 | #include <linux/hwmon-vid.h> |
22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
23 | #include <linux/jiffies.h> | ||
23 | 24 | ||
24 | /* Indexes for the sysfs hooks */ | 25 | /* Indexes for the sysfs hooks */ |
25 | 26 | ||
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 8f3f6f2c45f..b41baffa20f 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <linux/leds.h> | 43 | #include <linux/leds.h> |
44 | #include <linux/hwmon.h> | 44 | #include <linux/hwmon.h> |
45 | #include <linux/workqueue.h> | 45 | #include <linux/workqueue.h> |
46 | #include <linux/err.h> | ||
46 | 47 | ||
47 | /* data port used by Apple SMC */ | 48 | /* data port used by Apple SMC */ |
48 | #define APPLESMC_DATA_PORT 0x300 | 49 | #define APPLESMC_DATA_PORT 0x300 |
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index cccb0e9d45b..56dbcfb3e30 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c | |||
@@ -14,6 +14,8 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/dmi.h> | 16 | #include <linux/dmi.h> |
17 | #include <linux/jiffies.h> | ||
18 | #include <linux/err.h> | ||
17 | 19 | ||
18 | #include <acpi/acpi.h> | 20 | #include <acpi/acpi.h> |
19 | #include <acpi/acpixf.h> | 21 | #include <acpi/acpixf.h> |
diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c index fc65f2d3ec9..b8d01c5f571 100644 --- a/drivers/hwmon/da9052-hwmon.c +++ b/drivers/hwmon/da9052-hwmon.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/delay.h> | ||
16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
17 | #include <linux/hwmon.h> | 16 | #include <linux/hwmon.h> |
18 | #include <linux/hwmon-sysfs.h> | 17 | #include <linux/hwmon-sysfs.h> |
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c index 68ab94bde3f..142e1cb8dea 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/err.h> | 33 | #include <linux/err.h> |
34 | #include <linux/sysfs.h> | 34 | #include <linux/sysfs.h> |
35 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
36 | #include <linux/jiffies.h> | ||
36 | 37 | ||
37 | #define THERMAL_PID_REG 0xfd | 38 | #define THERMAL_PID_REG 0xfd |
38 | #define THERMAL_SMSC_ID_REG 0xfe | 39 | #define THERMAL_SMSC_ID_REG 0xfe |
diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c index ada12a98a97..a98c917b588 100644 --- a/drivers/hwmon/emc6w201.c +++ b/drivers/hwmon/emc6w201.c | |||
@@ -18,7 +18,6 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/delay.h> | ||
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <linux/jiffies.h> | 23 | #include <linux/jiffies.h> |
diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c index e8ee75f5547..9a675efaa78 100644 --- a/drivers/hwmon/hih6130.c +++ b/drivers/hwmon/hih6130.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
34 | #include <linux/device.h> | 34 | #include <linux/device.h> |
35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
36 | #include <linux/jiffies.h> | ||
36 | 37 | ||
37 | /** | 38 | /** |
38 | * struct hih6130 - HIH-6130 device specific data | 39 | * struct hih6130 - HIH-6130 device specific data |
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index a18882cc073..46141abaafb 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> |
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index 37f17e0d9d5..a14f634248e 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
37 | #include <linux/math64.h> | 37 | #include <linux/math64.h> |
38 | #include <linux/time.h> | 38 | #include <linux/time.h> |
39 | #include <linux/err.h> | ||
39 | 40 | ||
40 | #define REFRESH_INTERVAL (HZ) | 41 | #define REFRESH_INTERVAL (HZ) |
41 | #define IPMI_TIMEOUT (30 * HZ) | 42 | #define IPMI_TIMEOUT (30 * HZ) |
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index 41dbf8161ed..b622a93ec32 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/jiffies.h> | 26 | #include <linux/jiffies.h> |
27 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/err.h> | ||
29 | 30 | ||
30 | #define REFRESH_INTERVAL (2 * HZ) | 31 | #define REFRESH_INTERVAL (2 * HZ) |
31 | #define DRVNAME "ibmpex" | 32 | #define DRVNAME "ibmpex" |
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 70717d4a5e8..2b726346f8f 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
34 | #include <linux/hwmon.h> | 34 | #include <linux/hwmon.h> |
35 | #include <linux/hwmon-sysfs.h> | 35 | #include <linux/hwmon-sysfs.h> |
36 | #include <linux/jiffies.h> | ||
36 | 37 | ||
37 | #include <linux/platform_data/ina2xx.h> | 38 | #include <linux/platform_data/ina2xx.h> |
38 | 39 | ||
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index 49a69c5b3b8..e8c7fb0bbf9 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c | |||
@@ -22,7 +22,6 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/delay.h> | ||
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
28 | #include <linux/jiffies.h> | 27 | #include <linux/jiffies.h> |
diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c index bd75d241543..41df29f59b0 100644 --- a/drivers/hwmon/lineage-pem.c +++ b/drivers/hwmon/lineage-pem.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/hwmon.h> | 30 | #include <linux/hwmon.h> |
31 | #include <linux/hwmon-sysfs.h> | 31 | #include <linux/hwmon-sysfs.h> |
32 | #include <linux/jiffies.h> | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * This driver supports various Lineage Compact Power Line DC/DC and AC/DC | 35 | * This driver supports various Lineage Compact Power Line DC/DC and AC/DC |
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c index 2282d77e83e..71626f3c874 100644 --- a/drivers/hwmon/lm92.c +++ b/drivers/hwmon/lm92.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <linux/hwmon-sysfs.h> | 48 | #include <linux/hwmon-sysfs.h> |
49 | #include <linux/err.h> | 49 | #include <linux/err.h> |
50 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
51 | #include <linux/jiffies.h> | ||
51 | 52 | ||
52 | /* | 53 | /* |
53 | * The LM92 and MAX6635 have 2 two-state pins for address selection, | 54 | * The LM92 and MAX6635 have 2 two-state pins for address selection, |
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c index c3d4255ed15..1a003f73e4e 100644 --- a/drivers/hwmon/lm93.c +++ b/drivers/hwmon/lm93.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/hwmon-vid.h> | 47 | #include <linux/hwmon-vid.h> |
48 | #include <linux/err.h> | 48 | #include <linux/err.h> |
49 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
50 | #include <linux/jiffies.h> | ||
50 | 51 | ||
51 | /* LM93 REGISTER ADDRESSES */ | 52 | /* LM93 REGISTER ADDRESSES */ |
52 | 53 | ||
diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c index 8496baa08bc..4319a94f549 100644 --- a/drivers/hwmon/ltc4151.c +++ b/drivers/hwmon/ltc4151.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
37 | #include <linux/hwmon.h> | 37 | #include <linux/hwmon.h> |
38 | #include <linux/hwmon-sysfs.h> | 38 | #include <linux/hwmon-sysfs.h> |
39 | #include <linux/jiffies.h> | ||
39 | 40 | ||
40 | /* chip registers */ | 41 | /* chip registers */ |
41 | #define LTC4151_SENSE_H 0x00 | 42 | #define LTC4151_SENSE_H 0x00 |
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c index 98b3d04f98b..e8876108a6b 100644 --- a/drivers/hwmon/ltc4215.c +++ b/drivers/hwmon/ltc4215.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
20 | #include <linux/hwmon.h> | 20 | #include <linux/hwmon.h> |
21 | #include <linux/hwmon-sysfs.h> | 21 | #include <linux/hwmon-sysfs.h> |
22 | #include <linux/jiffies.h> | ||
22 | 23 | ||
23 | /* Here are names of the chip's registers (a.k.a. commands) */ | 24 | /* Here are names of the chip's registers (a.k.a. commands) */ |
24 | enum ltc4215_cmd { | 25 | enum ltc4215_cmd { |
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c index 52075914eb0..3653f79dc2d 100644 --- a/drivers/hwmon/ltc4245.c +++ b/drivers/hwmon/ltc4245.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
22 | #include <linux/hwmon.h> | 22 | #include <linux/hwmon.h> |
23 | #include <linux/hwmon-sysfs.h> | 23 | #include <linux/hwmon-sysfs.h> |
24 | #include <linux/jiffies.h> | ||
24 | #include <linux/i2c/ltc4245.h> | 25 | #include <linux/i2c/ltc4245.h> |
25 | 26 | ||
26 | /* Here are names of the chip's registers (a.k.a. commands) */ | 27 | /* Here are names of the chip's registers (a.k.a. commands) */ |
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c index 77476a575c4..84a2d2872b2 100644 --- a/drivers/hwmon/ltc4261.c +++ b/drivers/hwmon/ltc4261.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
34 | #include <linux/hwmon.h> | 34 | #include <linux/hwmon.h> |
35 | #include <linux/hwmon-sysfs.h> | 35 | #include <linux/hwmon-sysfs.h> |
36 | #include <linux/jiffies.h> | ||
36 | 37 | ||
37 | /* chip registers */ | 38 | /* chip registers */ |
38 | #define LTC4261_STATUS 0x00 /* readonly */ | 39 | #define LTC4261_STATUS 0x00 /* readonly */ |
diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c index 019427d7a5f..e0019c69d1b 100644 --- a/drivers/hwmon/max16065.c +++ b/drivers/hwmon/max16065.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
23 | #include <linux/hwmon.h> | 23 | #include <linux/hwmon.h> |
24 | #include <linux/hwmon-sysfs.h> | 24 | #include <linux/hwmon-sysfs.h> |
25 | #include <linux/delay.h> | ||
26 | #include <linux/jiffies.h> | 25 | #include <linux/jiffies.h> |
27 | 26 | ||
28 | enum chips { max16065, max16066, max16067, max16068, max16070, max16071 }; | 27 | enum chips { max16065, max16066, max16067, max16068, max16070, max16071 }; |
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 6c11ec21407..445e5d40ac8 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * max1619.c - Part of lm_sensors, Linux kernel modules for hardware | 2 | * max1619.c - Part of lm_sensors, Linux kernel modules for hardware |
3 | * monitoring | 3 | * monitoring |
4 | * Copyright (C) 2003-2004 Alexey Fisher <fishor@mail.ru> | 4 | * Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net> |
5 | * Jean Delvare <khali@linux-fr.org> | 5 | * Jean Delvare <khali@linux-fr.org> |
6 | * | 6 | * |
7 | * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim. | 7 | * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim. |
@@ -357,7 +357,7 @@ static struct max1619_data *max1619_update_device(struct device *dev) | |||
357 | 357 | ||
358 | module_i2c_driver(max1619_driver); | 358 | module_i2c_driver(max1619_driver); |
359 | 359 | ||
360 | MODULE_AUTHOR("Alexey Fisher <fishor@mail.ru> and " | 360 | MODULE_AUTHOR("Oleksij Rempel <bug-track@fisher-privat.net> and " |
361 | "Jean Delvare <khali@linux-fr.org>"); | 361 | "Jean Delvare <khali@linux-fr.org>"); |
362 | MODULE_DESCRIPTION("MAX1619 sensor driver"); | 362 | MODULE_DESCRIPTION("MAX1619 sensor driver"); |
363 | MODULE_LICENSE("GPL"); | 363 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hwmon/max6642.c b/drivers/hwmon/max6642.c index bf236c0782b..223461a6d70 100644 --- a/drivers/hwmon/max6642.c +++ b/drivers/hwmon/max6642.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Derived from: | 7 | * Derived from: |
8 | * | 8 | * |
9 | * Based on the max1619 driver. | 9 | * Based on the max1619 driver. |
10 | * Copyright (C) 2003-2004 Alexey Fisher <fishor@mail.ru> | 10 | * Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net> |
11 | * Jean Delvare <khali@linux-fr.org> | 11 | * Jean Delvare <khali@linux-fr.org> |
12 | * | 12 | * |
13 | * The MAX6642 is a sensor chip made by Maxim. | 13 | * The MAX6642 is a sensor chip made by Maxim. |
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 29b319db573..7d19b1bb9ce 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/hwmon.h> | 27 | #include <linux/hwmon.h> |
28 | #include <linux/hwmon-sysfs.h> | 28 | #include <linux/hwmon-sysfs.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/jiffies.h> |
30 | #include <linux/i2c/pmbus.h> | 30 | #include <linux/i2c/pmbus.h> |
31 | #include "pmbus.h" | 31 | #include "pmbus.h" |
32 | 32 | ||
diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c index fe11b95670b..bcecd025fcc 100644 --- a/drivers/hwmon/s3c-hwmon.c +++ b/drivers/hwmon/s3c-hwmon.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/delay.h> | ||
26 | #include <linux/io.h> | 25 | #include <linux/io.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
28 | #include <linux/err.h> | 27 | #include <linux/err.h> |
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c index c2565d04cd4..5f67546950b 100644 --- a/drivers/hwmon/sht21.c +++ b/drivers/hwmon/sht21.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
31 | #include <linux/device.h> | 31 | #include <linux/device.h> |
32 | #include <linux/jiffies.h> | ||
32 | 33 | ||
33 | /* I2C command bytes */ | 34 | /* I2C command bytes */ |
34 | #define SHT21_TRIG_T_MEASUREMENT_HM 0xe3 | 35 | #define SHT21_TRIG_T_MEASUREMENT_HM 0xe3 |
diff --git a/drivers/hwmon/smm665.c b/drivers/hwmon/smm665.c index cbc51fb30db..d9e1b7de78d 100644 --- a/drivers/hwmon/smm665.c +++ b/drivers/hwmon/smm665.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/hwmon.h> | 24 | #include <linux/hwmon.h> |
25 | #include <linux/hwmon-sysfs.h> | 25 | #include <linux/hwmon-sysfs.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/jiffies.h> | ||
27 | 28 | ||
28 | /* Internal reference voltage (VREF, x 1000 */ | 29 | /* Internal reference voltage (VREF, x 1000 */ |
29 | #define SMM665_VREF_ADC_X1000 1250 | 30 | #define SMM665_VREF_ADC_X1000 1250 |
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c index 080c2637048..3c2c48d904e 100644 --- a/drivers/hwmon/thmc50.c +++ b/drivers/hwmon/thmc50.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/hwmon-sysfs.h> | 28 | #include <linux/hwmon-sysfs.h> |
29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
31 | #include <linux/jiffies.h> | ||
31 | 32 | ||
32 | MODULE_LICENSE("GPL"); | 33 | MODULE_LICENSE("GPL"); |
33 | 34 | ||
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 4e1ff82c63e..b8777e54190 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
27 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
28 | #include <linux/device.h> | 28 | #include <linux/device.h> |
29 | #include <linux/jiffies.h> | ||
29 | 30 | ||
30 | #define DRIVER_NAME "tmp102" | 31 | #define DRIVER_NAME "tmp102" |
31 | 32 | ||
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c index c315c59f61f..44136bb6d04 100644 --- a/drivers/hwmon/ultra45_env.c +++ b/drivers/hwmon/ultra45_env.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
13 | #include <linux/hwmon.h> | 13 | #include <linux/hwmon.h> |
14 | #include <linux/hwmon-sysfs.h> | 14 | #include <linux/hwmon-sysfs.h> |
15 | #include <linux/err.h> | ||
15 | 16 | ||
16 | #define DRV_MODULE_VERSION "0.1" | 17 | #define DRV_MODULE_VERSION "0.1" |
17 | 18 | ||
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index 93ea81a4bf3..39ab7bcc616 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/hwmon-sysfs.h> | 41 | #include <linux/hwmon-sysfs.h> |
42 | #include <linux/err.h> | 42 | #include <linux/err.h> |
43 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
44 | #include <linux/jiffies.h> | ||
44 | 45 | ||
45 | #define NUMBER_OF_VIN 10 | 46 | #define NUMBER_OF_VIN 10 |
46 | #define NUMBER_OF_FANIN 5 | 47 | #define NUMBER_OF_FANIN 5 |
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 06d6f56d4f6..053645279f3 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/err.h> | 44 | #include <linux/err.h> |
45 | #include <linux/mutex.h> | 45 | #include <linux/mutex.h> |
46 | #include <linux/sysfs.h> | 46 | #include <linux/sysfs.h> |
47 | #include <linux/jiffies.h> | ||
47 | 48 | ||
48 | /* Addresses to scan */ | 49 | /* Addresses to scan */ |
49 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | 50 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, |
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 4fc47e06207..99799fd1d91 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/kref.h> | 46 | #include <linux/kref.h> |
47 | #include <linux/notifier.h> | 47 | #include <linux/notifier.h> |
48 | #include <linux/reboot.h> | 48 | #include <linux/reboot.h> |
49 | #include <linux/jiffies.h> | ||
49 | 50 | ||
50 | /* Default values */ | 51 | /* Default values */ |
51 | #define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ | 52 | #define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ |
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c index b813c646c7c..55a4f489453 100644 --- a/drivers/hwmon/w83795.c +++ b/drivers/hwmon/w83795.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/hwmon-sysfs.h> | 34 | #include <linux/hwmon-sysfs.h> |
35 | #include <linux/err.h> | 35 | #include <linux/err.h> |
36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
37 | #include <linux/delay.h> | 37 | #include <linux/jiffies.h> |
38 | 38 | ||
39 | /* Addresses to scan */ | 39 | /* Addresses to scan */ |
40 | static const unsigned short normal_i2c[] = { | 40 | static const unsigned short normal_i2c[] = { |
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c index c99c8a0473c..f0e8286c3c7 100644 --- a/drivers/hwmon/w83l786ng.c +++ b/drivers/hwmon/w83l786ng.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/hwmon-sysfs.h> | 33 | #include <linux/hwmon-sysfs.h> |
34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
35 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
36 | #include <linux/jiffies.h> | ||
36 | 37 | ||
37 | /* Addresses to scan */ | 38 | /* Addresses to scan */ |
38 | static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END }; | 39 | static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END }; |