diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2016-09-06 21:42:54 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-08 08:13:08 +0200 |
commit | f5fbf848303c8704d0e1a1e7cabd08fd0a49552f (patch) | |
tree | 2835a8edce18fe8a0f1bdfe775ce7b0e5cd00532 /arch/x86/platform/atom | |
parent | bda7b072de999280ef78aaea4335ec58afc4bdb2 (diff) | |
download | op-kernel-dev-f5fbf848303c8704d0e1a1e7cabd08fd0a49552f.zip op-kernel-dev-f5fbf848303c8704d0e1a1e7cabd08fd0a49552f.tar.gz |
x86/cpu: Rename Merrifield2 to Moorefield
Merrifield2 is actually Moorefield.
Rename it accordingly and drop tail digit from Merrifield1.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160906184254.94440-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/atom')
-rw-r--r-- | arch/x86/platform/atom/punit_atom_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c index 8ff7b93..d49d3be 100644 --- a/arch/x86/platform/atom/punit_atom_debug.c +++ b/arch/x86/platform/atom/punit_atom_debug.c @@ -155,7 +155,7 @@ static void punit_dbgfs_unregister(void) static const struct x86_cpu_id intel_punit_cpu_ids[] = { ICPU(INTEL_FAM6_ATOM_SILVERMONT1, punit_device_byt), - ICPU(INTEL_FAM6_ATOM_MERRIFIELD1, punit_device_tng), + ICPU(INTEL_FAM6_ATOM_MERRIFIELD, punit_device_tng), ICPU(INTEL_FAM6_ATOM_AIRMONT, punit_device_cht), {} }; |