diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-04 13:21:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-04 13:21:43 +0200 |
| commit | 5d1191ab6cd82b1347eb1b023a3b1eb36ae74ec9 (patch) | |
| tree | 89a3effc70464c52829afed58bcb4b961df048c5 /drivers/mmc | |
| parent | cpufreq: Avoid false-positive WARN_ON()s in cpufreq_update_policy() (diff) | |
| parent | intel_pstate: Declare pid_params/pstate_funcs/hwp_active __read_mostly (diff) | |
| download | linux-dev-5d1191ab6cd82b1347eb1b023a3b1eb36ae74ec9.tar.xz linux-dev-5d1191ab6cd82b1347eb1b023a3b1eb36ae74ec9.zip | |
Merge back earlier cpufreq material for v4.8.
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 }, {} }; |