Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a6fa9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of... 

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Make Dell Latitude E6420 use reboot=pci
  x86: Make Dell Latitude E5420 use reboot=pci
parents ad21b115 a536877e

arch/x86/kernel/reboot.c

+16 −0
Original line number Diff line number Diff line
@@ -427,6 +427,22 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),

		},

	},

	{	/* 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"),

		},

	},

	{	/* Handle problems with rebooting on the Latitude E6420. */

		.callback = set_pci_reboot,

		.ident = "Dell Latitude E6420",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),

		},

	},

	{ }

};