From 0a9405380803623fa89af4e7568e28cb39e57e15 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Wed, 27 Jan 2010 15:29:18 -0800 Subject: [PATCH] --- yaml --- r: 180091 b: refs/heads/master c: 35ea63d70f827a26c150993b4b940925bb02b03f h: refs/heads/master i: 180089: 69a5ea9b83ce9a2de64ad13b5a065d4343a2adad 180087: 80eaca72b428c2c21da604a5f7474c7ad52a70ec v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 24d89507f008..a17a9e23cefb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aca3bb5910119d4cf6c28568a642582efb4cc14a +refs/heads/master: 35ea63d70f827a26c150993b4b940925bb02b03f diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c index 1545bc0c9845..704bddcdf64d 100644 --- a/trunk/arch/x86/kernel/reboot.c +++ b/trunk/arch/x86/kernel/reboot.c @@ -203,6 +203,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "0T656F"), }, }, + { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G*/ + .callback = set_bios_reboot, + .ident = "Dell OptiPlex 760", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"), + DMI_MATCH(DMI_BOARD_NAME, "0G919G"), + }, + }, { /* Handle problems with rebooting on Dell 2400's */ .callback = set_bios_reboot, .ident = "Dell PowerEdge 2400",