tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[]
Duplicate entries ended up acpisleep_dmi_table[] by accident.
They don't hurt functionality, but they are ugly, so let's get
rid of them.
Cc: stable@kernel.org
Signed-off-by: Alex Chiang <achiang@canonical.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Alex Chiang
and committed by
Linus Torvalds
7d6fb7bd
94b849aa
+1
-89
+1
-89
drivers/acpi/sleep.c
+1
-89
drivers/acpi/sleep.c
···
475
475
},
476
476
{
477
477
.callback = init_set_sci_en_on_resume,
478
-
.ident = "Lenovo ThinkPad X201",
478
+
.ident = "Lenovo ThinkPad X201[s]",
479
479
.matches = {
480
480
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
481
481
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
482
-
},
483
-
},
484
-
{
485
-
.callback = init_set_sci_en_on_resume,
486
-
.ident = "Lenovo ThinkPad X201",
487
-
.matches = {
488
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
489
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
490
-
},
491
-
},
492
-
{
493
-
.callback = init_set_sci_en_on_resume,
494
-
.ident = "Lenovo ThinkPad T410",
495
-
.matches = {
496
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
497
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),
498
-
},
499
-
},
500
-
{
501
-
.callback = init_set_sci_en_on_resume,
502
-
.ident = "Lenovo ThinkPad T510",
503
-
.matches = {
504
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
505
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),
506
-
},
507
-
},
508
-
{
509
-
.callback = init_set_sci_en_on_resume,
510
-
.ident = "Lenovo ThinkPad W510",
511
-
.matches = {
512
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
513
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),
514
-
},
515
-
},
516
-
{
517
-
.callback = init_set_sci_en_on_resume,
518
-
.ident = "Lenovo ThinkPad X201",
519
-
.matches = {
520
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
521
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
522
-
},
523
-
},
524
-
{
525
-
.callback = init_set_sci_en_on_resume,
526
-
.ident = "Lenovo ThinkPad X201",
527
-
.matches = {
528
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
529
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
530
-
},
531
-
},
532
-
{
533
-
.callback = init_set_sci_en_on_resume,
534
-
.ident = "Lenovo ThinkPad T410",
535
-
.matches = {
536
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
537
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),
538
-
},
539
-
},
540
-
{
541
-
.callback = init_set_sci_en_on_resume,
542
-
.ident = "Lenovo ThinkPad T510",
543
-
.matches = {
544
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
545
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),
546
-
},
547
-
},
548
-
{
549
-
.callback = init_set_sci_en_on_resume,
550
-
.ident = "Lenovo ThinkPad W510",
551
-
.matches = {
552
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
553
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),
554
-
},
555
-
},
556
-
{
557
-
.callback = init_set_sci_en_on_resume,
558
-
.ident = "Lenovo ThinkPad X201",
559
-
.matches = {
560
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
561
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
562
-
},
563
-
},
564
-
{
565
-
.callback = init_set_sci_en_on_resume,
566
-
.ident = "Lenovo ThinkPad X201",
567
-
.matches = {
568
-
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
569
-
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
570
482
},
571
483
},
572
484
{