From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425779AbcFHOSR (ORCPT ); Wed, 8 Jun 2016 10:18:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33840 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422831AbcFHOSN (ORCPT ); Wed, 8 Jun 2016 10:18:13 -0400 Date: Wed, 8 Jun 2016 07:16:54 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: torvalds@linux-foundation.org, ulf.hansson@linaro.org, hpa@zytor.com, luto@amacapital.net, dave@sr71.net, tglx@linutronix.de, brgerst@gmail.com, dvlasenk@redhat.com, peterz@infradead.org, dave.hansen@linux.intel.com, bp@alien8.de, mingo@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com Reply-To: dave.hansen@linux.intel.com, bp@alien8.de, adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, brgerst@gmail.com, peterz@infradead.org, dvlasenk@redhat.com, dave@sr71.net, luto@amacapital.net, torvalds@linux-foundation.org, ulf.hansson@linaro.org, hpa@zytor.com In-Reply-To: <20160603001951.9EEA53D8@viggo.jf.intel.com> References: <20160603001951.9EEA53D8@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86, mmc: Use Intel family name macros for mmc driver Git-Commit-ID: 8ba4cb53129c3089f248f1ebeb25128d93c8b5c5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8ba4cb53129c3089f248f1ebeb25128d93c8b5c5 Gitweb: http://git.kernel.org/tip/8ba4cb53129c3089f248f1ebeb25128d93c8b5c5 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:51 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:26 +0200 x86, mmc: Use Intel family name macros for mmc driver Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Acked-by: Adrian Hunter Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ulf Hansson Cc: jacob.jun.pan@intel.com Cc: linux-mmc@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001951.9EEA53D8@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- drivers/mmc/host/sdhci-acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 458ffb7..008709c 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -43,6 +43,7 @@ #ifdef CONFIG_X86 #include +#include #include #endif @@ -126,7 +127,7 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = { static bool sdhci_acpi_byt(void) { static const struct x86_cpu_id byt[] = { - { X86_VENDOR_INTEL, 6, 0x37 }, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 }, {} };