From 9a25eb1198bcfc6fa35069df3874275497938a9b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jun 2011 15:57:31 +0200 Subject: [PATCH] --- yaml --- r: 255012 b: refs/heads/master c: 3628c3f5c818cfc6e588d1ccb31f19aa12345c02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8589c366d2c..23257c5aecfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11e48feebe8b5d2ae348893a6e0d47c46204bee2 +refs/heads/master: 3628c3f5c818cfc6e588d1ccb31f19aa12345c02 diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c index 4f0d46fefa7f..14eed214b584 100644 --- a/trunk/arch/x86/kernel/reboot.c +++ b/trunk/arch/x86/kernel/reboot.c @@ -419,6 +419,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), }, }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = set_pci_reboot, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, { } };