diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-07 16:36:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-07 16:36:54 +0400 |
| commit | 826389d137d99ad5596d4b2b7747e29e250f468c (patch) | |
| tree | aa83910ac323a1709ef7512287d8db2e5589f427 /drivers/hwmon/asb100.c | |
| parent | 69a8ebfa218f6573c937dc3d5101071e3d62af10 (diff) | |
| parent | 4101ece3a226e68a5335dd8a15c7ab8663972b81 (diff) | |
| download | linux-826389d137d99ad5596d4b2b7747e29e250f468c.tar.xz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Fix chip feature table headers
hwmon: (w83627ehf) Force initial bank selection
Diffstat (limited to 'drivers/hwmon/asb100.c')
| -rw-r--r-- | drivers/hwmon/asb100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index a227be47149f..520e5bf4f76d 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c @@ -32,7 +32,7 @@ * ASB100-A supports pwm1, while plain ASB100 does not. There is no known * way for the driver to tell which one is there. * - * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA * asb100 7 3 1 4 0x31 0x0694 yes no */ |