diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:29 -0400 |
| commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
| tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /drivers/acpi/sleep.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index f74834a544fd..e2e992599e68 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -450,6 +450,126 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 450 | }, | 450 | }, |
| 451 | }, | 451 | }, |
| 452 | { | 452 | { |
| 453 | .callback = init_set_sci_en_on_resume, | ||
| 454 | .ident = "Lenovo ThinkPad T410", | ||
| 455 | .matches = { | ||
| 456 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 457 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"), | ||
| 458 | }, | ||
| 459 | }, | ||
| 460 | { | ||
| 461 | .callback = init_set_sci_en_on_resume, | ||
| 462 | .ident = "Lenovo ThinkPad T510", | ||
| 463 | .matches = { | ||
| 464 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 465 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"), | ||
| 466 | }, | ||
| 467 | }, | ||
| 468 | { | ||
| 469 | .callback = init_set_sci_en_on_resume, | ||
| 470 | .ident = "Lenovo ThinkPad W510", | ||
| 471 | .matches = { | ||
| 472 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 473 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"), | ||
| 474 | }, | ||
| 475 | }, | ||
| 476 | { | ||
| 477 | .callback = init_set_sci_en_on_resume, | ||
| 478 | .ident = "Lenovo ThinkPad X201", | ||
| 479 | .matches = { | ||
| 480 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 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 | }, | ||
| 571 | }, | ||
| 572 | { | ||
| 453 | .callback = init_old_suspend_ordering, | 573 | .callback = init_old_suspend_ordering, |
| 454 | .ident = "Panasonic CF51-2L", | 574 | .ident = "Panasonic CF51-2L", |
| 455 | .matches = { | 575 | .matches = { |
| @@ -458,6 +578,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 458 | DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), | 578 | DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), |
| 459 | }, | 579 | }, |
| 460 | }, | 580 | }, |
| 581 | { | ||
| 582 | .callback = init_set_sci_en_on_resume, | ||
| 583 | .ident = "Dell Studio 1558", | ||
| 584 | .matches = { | ||
| 585 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 586 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"), | ||
| 587 | }, | ||
| 588 | }, | ||
| 589 | { | ||
| 590 | .callback = init_set_sci_en_on_resume, | ||
| 591 | .ident = "Dell Studio 1557", | ||
| 592 | .matches = { | ||
| 593 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 594 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"), | ||
| 595 | }, | ||
| 596 | }, | ||
| 597 | { | ||
| 598 | .callback = init_set_sci_en_on_resume, | ||
| 599 | .ident = "Dell Studio 1555", | ||
| 600 | .matches = { | ||
| 601 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 602 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"), | ||
| 603 | }, | ||
| 604 | }, | ||
| 461 | {}, | 605 | {}, |
| 462 | }; | 606 | }; |
| 463 | #endif /* CONFIG_SUSPEND */ | 607 | #endif /* CONFIG_SUSPEND */ |