From: Willy Tarreau <w@1wt.eu>
Date: Sun, 12 Feb 2012 19:54:08 +0000 (+0100)
Subject: Revert "x86: Make Dell Latitude E5420 use reboot=pci"
X-Git-Tag: v2.6.27.61~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a41f51c3ddd83110bb209ebc2d65fb4fcba85b3f;p=thirdparty%2Fkernel%2Fstable.git

Revert "x86: Make Dell Latitude E5420 use reboot=pci"

This reverts commit 8b752bf5367de4216a1eeef0b36bd3e05326e2ff.

Stefan Cososchi reported a build breakage on 32-bit (only worked
fine on x86_64). It needs a backport of 6c6c51e4 to work. Revert
this patch as it's not critical anyway.

Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7a774270df19c..f2e02b7aef306 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -227,14 +227,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
 		},
 	},
-	{	/* Handle problems with rebooting on the Latitude E5420. */
-		.callback = set_pci_reboot,
-		.ident = "Dell Latitude E5420",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
-		},
-	},
 	{ }
 };