Commit 7b51ba38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  Revert "PCI: Correct last two HP entries in the bfsort whitelist"
parents 4f81c535 739db07f

arch/x86/pci/common.c

+4 −4
Original line number Diff line number Diff line
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { 
#endif

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant DL360",

		.ident = "HP ProLiant DL385 G2",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant DL380",

		.ident = "HP ProLiant DL585 G2",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),

		},

	},

	{}