diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-02-13 14:19:13 +0200 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-02-13 14:21:42 +0200 |
| commit | 432c2adb9e2f84f81c4b218acb07a2cd3dce64a9 (patch) | |
| tree | 8fcde78af0c929468971a8967f4d4b0a51f178c2 /drivers/platform/x86/intel/pmc | |
| parent | bd820906ea9dc3acfcac9de4f1be89b78609e2ac (diff) | |
| parent | b3e127dacad60a384c92baafdc74f1508bf7dd47 (diff) | |
Merge branch 'fixes' into for-next
Merge fixes into for-next to avoid int3472 and thinkpad_acpi conflicts
with upcoming changes.
Diffstat (limited to 'drivers/platform/x86/intel/pmc')
| -rw-r--r-- | drivers/platform/x86/intel/pmc/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index d819478fea29..1b85800ec10f 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -626,8 +626,8 @@ static u32 convert_ltr_scale(u32 val) static int pmc_core_ltr_show(struct seq_file *s, void *unused) { struct pmc_dev *pmcdev = s->private; - u64 decoded_snoop_ltr, decoded_non_snoop_ltr; - u32 ltr_raw_data, scale, val; + u64 decoded_snoop_ltr, decoded_non_snoop_ltr, val; + u32 ltr_raw_data, scale; u16 snoop_ltr, nonsnoop_ltr; unsigned int i, index, ltr_index = 0; |