diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2016-06-13 23:48:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2016-06-13 23:48:23 +0200 |
| commit | b77b5651082a4fa4091ac4e864254d9e71d15880 (patch) | |
| tree | 44b3b001cfd8ef1bfcf3e46484c6eae6230d68a2 /drivers/platform/x86/intel_telemetry_debugfs.c | |
| parent | Linux 4.7-rc3 (diff) | |
| parent | x86, thermal: Clean up and fix CPU model detection for intel_soc_dts_thermal (diff) | |
| download | linux-b77b5651082a4fa4091ac4e864254d9e71d15880.tar.gz linux-b77b5651082a4fa4091ac4e864254d9e71d15880.tar.bz2 linux-b77b5651082a4fa4091ac4e864254d9e71d15880.zip | |
Merge branch 'x86/cpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into x86/cpu
Pull recent changes related to x86 CPU model representations from tip.
Diffstat (limited to 'drivers/platform/x86/intel_telemetry_debugfs.c')
| -rw-r--r-- | drivers/platform/x86/intel_telemetry_debugfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index f5134acd6ff0..815a7c5e9566 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -32,6 +32,7 @@ #include <linux/suspend.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/intel_pmc_ipc.h> #include <asm/intel_punit_ipc.h> #include <asm/intel_telemetry.h> @@ -331,7 +332,7 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = { }; static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { - TELEM_DEBUGFS_CPU(0x5c, telem_apl_debugfs_conf), + TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf), {} }; |