aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.com>2005-11-29 19:34:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-29 19:47:03 -0800
commitd91b14c463306eb6527550ba48617e7f5500d3ae (patch)
tree674e16ed108754da2a28c9abf59c78288f7ea396 /arch
parent5bd0190bf3d7e53043a048e809ffa29d41b9d6ac (diff)
downloadkernel_samsung_espresso10-d91b14c463306eb6527550ba48617e7f5500d3ae.zip
kernel_samsung_espresso10-d91b14c463306eb6527550ba48617e7f5500d3ae.tar.gz
kernel_samsung_espresso10-d91b14c463306eb6527550ba48617e7f5500d3ae.tar.bz2
[PATCH] fix rebooting on HP nc6120 laptop
Anne NICOLAS <anne.nicolas@mandriva.com> and Andres Kaaber <andres.kaaber@rescue.ee> reported their HP laptop didn't reboot smoothly. Signed-off-by: Thierry Vignaud <tvignaud@mandriva.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.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 350ea66..2afe0f8 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -111,6 +111,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
},
},
+ { /* Handle problems with rebooting on HP nc6120 */
+ .callback = set_bios_reboot,
+ .ident = "HP Compaq nc6120",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"),
+ },
+ },
{ }
};