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 /drivers/pci/pci-mid.c | |
| parent | bda7b072de999280ef78aaea4335ec58afc4bdb2 (diff) | |
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 'drivers/pci/pci-mid.c')
| -rw-r--r-- | drivers/pci/pci-mid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index c878aa71173b..b7ea64f63149 100644 --- a/drivers/pci/pci-mid.c +++ b/drivers/pci/pci-mid.c @@ -61,7 +61,7 @@ static struct pci_platform_pm_ops mid_pci_platform_pm = { #define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } static const struct x86_cpu_id lpss_cpu_ids[] = { - ICPU(INTEL_FAM6_ATOM_MERRIFIELD1), + ICPU(INTEL_FAM6_ATOM_MERRIFIELD), {} }; |