diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:45:39 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:45:39 +0200 |
| commit | 9fedbb3b6bb8d00c973f01dcf14af8eedf5eb495 (patch) | |
| tree | cb4a1b2c48cf610ddf453c8138b58283936d0ff3 /drivers/mmc | |
| parent | Merge branches 'pm-core', 'pm-clk', 'pm-domains' and 'pm-pci' (diff) | |
| parent | Merge branch 'x86/cpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into x86/cpu (diff) | |
| download | linux-dev-9fedbb3b6bb8d00c973f01dcf14af8eedf5eb495.tar.xz linux-dev-9fedbb3b6bb8d00c973f01dcf14af8eedf5eb495.zip | |
Merge branch 'x86/cpu' from tip
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-acpi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 458ffb7637e5..008709c5cb09 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -43,6 +43,7 @@ #ifdef CONFIG_X86 #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/iosf_mbi.h> #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 }, {} }; |