Merge tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[platform/kernel/linux-rpi.git] / drivers / mmc / host / sdhci-acpi.c

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 68cf417..faba53c 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -242,7 +242,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, INTEL_FAM6_ATOM_SILVERMONT },
+               X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, NULL),
                {}
        };
 
@@ -252,7 +252,7 @@ static bool sdhci_acpi_byt(void)
 static bool sdhci_acpi_cht(void)
 {
        static const struct x86_cpu_id cht[] = {
-               { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT },
+               X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL),
                {}
        };