git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
ec.c
diff --git
a/drivers/acpi/ec.c
b/drivers/acpi/ec.c
index 442a9e24f4397674041fa9f557bd90fef7763297..917f77f4cb556b9f4a1061c9b10dea72f8a9d81f 100644
(file)
--- a/
drivers/acpi/ec.c
+++ b/
drivers/acpi/ec.c
@@
-2042,7
+2042,7
@@
static const struct dmi_system_id acpi_ec_no_wakeup[] = {
.ident = "Thinkpad X1 Carbon 6th",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_PRODUCT_
NAME, "20KGS3JF01
"),
+ DMI_MATCH(DMI_PRODUCT_
FAMILY, "Thinkpad X1 Carbon 6th
"),
},
},
{ },