path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 08:49:18 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 08:49:18 +0900
commite626d177fcb7d8eb759da49c652a68ff90a59fba (patch)
tree6223d17d7601212c51d223657d273d6e7bc0807a /Documentation
parentdf632d3ce7eacf92ad9b642301c7b53a1d95b8d8 (diff)
parent0657777fcefffbf79d4a5fa0952a3f1a4248c0da (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
Diffstat (limited to 'Documentation')
3 files changed, 3 insertions, 3 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:
The junction temperature attribute is supported by the driver.
The battery temperature is calculated:
- Degree Celcius = 1 / (t1 + 1/298)- 273
+ Degree Celsius = 1 / (t1 + 1/298)- 273
where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255))
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:
- Alexey Fisher <fishor@mail.ru>,
+ Oleksij Rempel <bug-track@fisher-privat.net>,
Jean Delvare <khali@linux-fr.org>
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
The Sysfs nodes will represent the voltage in the units of mV,
the temperature channel shows the converted temperature in
-degree celcius. The Battery charging current channel represents
+degree Celsius. The Battery charging current channel represents
battery charging current in mA.