aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Collins <ben.collins@ubuntu.com>2006-01-06 00:12:20 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:39 -0800
commit766c3f94d4492ee4ec60b65693e71ee4b1d6fd68 (patch)
tree7654da87fb55d9dc2963c3ff146f0eab6d4f316e /arch
parent76865c3f87e825dda0c458b02f30dd8ae64b7bdc (diff)
downloadkernel_samsung_espresso10-766c3f94d4492ee4ec60b65693e71ee4b1d6fd68.zip
kernel_samsung_espresso10-766c3f94d4492ee4ec60b65693e71ee4b1d6fd68.tar.gz
kernel_samsung_espresso10-766c3f94d4492ee4ec60b65693e71ee4b1d6fd68.tar.bz2
[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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 2afe0f8..2fa5803 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[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
},
},
- { /* Handle problems with rebooting on HP nc6120 */
+ { /* Handle problems with rebooting on HP laptops */
.callback = set_bios_reboot,
- .ident = "HP Compaq nc6120",
+ .ident = "HP Compaq Laptop",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
},
},
{ }