diff options
| author | Ben Collins <ben.collins@ubuntu.com> | 2006-01-06 03:12:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:39 -0500 |
| commit | 766c3f94d4492ee4ec60b65693e71ee4b1d6fd68 (patch) | |
| tree | 7654da87fb55d9dc2963c3ff146f0eab6d4f316e /arch | |
| parent | 76865c3f87e825dda0c458b02f30dd8ae64b7bdc (diff) | |
[PATCH] i386: Handle HP laptop rebooting properly.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/reboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 2afe0f8d555a..2fa5803a759d 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c | |||
| @@ -111,12 +111,12 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
| 111 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), | 111 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), |
| 112 | }, | 112 | }, |
| 113 | }, | 113 | }, |
| 114 | { /* Handle problems with rebooting on HP nc6120 */ | 114 | { /* Handle problems with rebooting on HP laptops */ |
| 115 | .callback = set_bios_reboot, | 115 | .callback = set_bios_reboot, |
| 116 | .ident = "HP Compaq nc6120", | 116 | .ident = "HP Compaq Laptop", |
| 117 | .matches = { | 117 | .matches = { |
| 118 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | 118 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), |
| 119 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"), | 119 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), |
| 120 | }, | 120 | }, |
| 121 | }, | 121 | }, |
| 122 | { } | 122 | { } |