Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276398
b: refs/heads/master
c: 6be30bb
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Ingo Molnar committed Dec 5, 2011
1 parent 5848998 commit 6eedc68
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b495e039b4ce2ce4a96b3006004faf082f4d50e2
refs/heads/master: 6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19
8 changes: 8 additions & 0 deletions trunk/arch/x86/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
},
},
{ /* Handle problems with rebooting on the OptiPlex 990. */
.callback = set_pci_reboot,
.ident = "Dell OptiPlex 990",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
},
},
{ }
};

Expand Down

0 comments on commit 6eedc68

Please sign in to comment.