diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 08:49:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 08:49:41 -0700 |
| commit | 30255100d7c253c82b596a0768235d5865eee2cf (patch) | |
| tree | 982c77473b182642f4dc6ea5b84e20998e9b9d56 /Documentation | |
| parent | 9efeaaf9a0c1a27c2be8b2d37c73142555702a4f (diff) | |
| parent | cd1faefa66425c3fa338777773c5c017edea3439 (diff) | |
| download | talos-op-linux-30255100d7c253c82b596a0768235d5865eee2cf.tar.gz talos-op-linux-30255100d7c253c82b596a0768235d5865eee2cf.zip | |
Merge tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Two patches for the nct6775 driver: add support for NCT6793D, and fix
swapped registers"
* tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6775) Add support for NCT6793D
hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/nct6775 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/hwmon/nct6775 b/Documentation/hwmon/nct6775 index f0dd3d2fec96..76add4c9cd68 100644 --- a/Documentation/hwmon/nct6775 +++ b/Documentation/hwmon/nct6775 @@ -32,6 +32,10 @@ Supported chips: Prefix: 'nct6792' Addresses scanned: ISA address retrieved from Super I/O registers Datasheet: Available from Nuvoton upon request + * Nuvoton NCT6793D + Prefix: 'nct6793' + Addresses scanned: ISA address retrieved from Super I/O registers + Datasheet: Available from Nuvoton upon request Authors: Guenter Roeck <linux@roeck-us.net> |
