diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /arch/x86/kernel/reboot.c | |
| parent | 470c66239ef0336429b35345f3f615d47341e13b (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 724adfc63cb9..cc5a2545dd41 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -169,6 +169,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
| 169 | DMI_MATCH(DMI_BOARD_NAME, "0KW626"), | 169 | DMI_MATCH(DMI_BOARD_NAME, "0KW626"), |
| 170 | }, | 170 | }, |
| 171 | }, | 171 | }, |
| 172 | { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ | ||
| 173 | .callback = set_bios_reboot, | ||
| 174 | .ident = "Dell OptiPlex 330", | ||
| 175 | .matches = { | ||
| 176 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 177 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"), | ||
| 178 | DMI_MATCH(DMI_BOARD_NAME, "0KP561"), | ||
| 179 | }, | ||
| 180 | }, | ||
| 172 | { /* Handle problems with rebooting on Dell 2400's */ | 181 | { /* Handle problems with rebooting on Dell 2400's */ |
| 173 | .callback = set_bios_reboot, | 182 | .callback = set_bios_reboot, |
| 174 | .ident = "Dell PowerEdge 2400", | 183 | .ident = "Dell PowerEdge 2400", |