Merge branches 'acpi-pci' and 'pm-pci'

[karo-tx-linux.git] / drivers / platform / chrome / chromeos_pstore.c

diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
index e0e0e65cf442c1dbd36602b42821b36cbf68731e..34749200e4ab5504d5f9fc64e84d1f46867ef322 100644 (file)
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@ -16,23 +16,13 @@
 static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
        {
                /*
-                * Today all Chromebooks/boxes ship with GOOGLE as vendor and
+                * Today all Chromebooks/boxes ship with Google_* as version and
                 * coreboot as bios vendor. No other systems with this
                 * combination are known to date.
                 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
-                       DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"),
-               },
-       },
-       {
-               /*
-                * The first Samsung Chromebox and Chromebook Series 5 550 use
-                * coreboot but with Samsung as the system vendor.
-                */
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG"),
                        DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "Google_"),
                },
        },
        {