hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
  PCI: correct mailing list address
  PCI: Correct last two HP entries in the bfsort whitelist
This commit is contained in:
Linus Torvalds 2008-05-20 10:55:04 -07:00
parent c110a2bd82 c1f69db782
commit 737b0fbf44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -3143,7 +3143,7 @@ PCI ERROR RECOVERY
P: Linas Vepstas P: Linas Vepstas
M: linas@austin.ibm.com M: linas@austin.ibm.com
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
L: linux-pci@atrey.karlin.mff.cuni.cz L: linux-pci@vger.kernel.org
S: Supported S: Supported
PCI SUBSYSTEM PCI SUBSYSTEM

8
arch/x86/pci/common.c
View File

@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
}, },
{ {
.callback = set_bf_sort, .callback = set_bf_sort,
.ident = "HP ProLiant DL385 G2", .ident = "HP ProLiant DL360",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "HP"), DMI_MATCH(DMI_SYS_VENDOR, "HP"),
DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
}, },
}, },
{ {
.callback = set_bf_sort, .callback = set_bf_sort,
.ident = "HP ProLiant DL585 G2", .ident = "HP ProLiant DL380",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "HP"), DMI_MATCH(DMI_SYS_VENDOR, "HP"),
DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
}, },
}, },
#ifdef __i386__ #ifdef __i386__