diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-08-03 09:37:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-08-03 09:37:31 -0300 |
| commit | b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56 (patch) | |
| tree | 92ce9158daae144032cc6297ab8fdbad12664247 /drivers/hwmon/nct6775.c | |
| parent | 7c43b0c1d499c790cdb5623d27fdcef544ddb566 (diff) | |
| parent | bcf876870b95592b52519ed4aafcf9d95999bc9c (diff) | |
| download | kernel_replicant_linux-b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56.tar.gz kernel_replicant_linux-b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56.tar.bz2 kernel_replicant_linux-b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there
was cherry-picked for the last perf/urgent pull req to Linus, so was
already there.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/hwmon/nct6775.c')
| -rw-r--r-- | drivers/hwmon/nct6775.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index e7e1ddc1d631..750b08713dee 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -786,13 +786,13 @@ static const char *const nct6798_temp_label[] = { "Agent1 Dimm1", "BYTE_TEMP0", "BYTE_TEMP1", - "", - "", + "PECI Agent 0 Calibration", /* undocumented */ + "PECI Agent 1 Calibration", /* undocumented */ "", "Virtual_TEMP" }; -#define NCT6798_TEMP_MASK 0x8fff0ffe +#define NCT6798_TEMP_MASK 0xbfff0ffe #define NCT6798_VIRT_TEMP_MASK 0x80000c00 /* NCT6102D/NCT6106D specific data */ |