diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
| commit | d20ead9e86881bc7ae84e385f47b5196b7d93aac (patch) | |
| tree | ed27dd5db5f8447e4b3f541f0ec38219085d2f32 /arch/x86/pci/common.c | |
| parent | c56ec7639288f3e5d6371b0c48d37da93642fc93 (diff) | |
| parent | 88e4d250234fc9e64d6ce51df95efdcf8334fd95 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...
Diffstat (limited to 'arch/x86/pci/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 2d71bbc411d2..f4386990b150 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -289,6 +289,22 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
| 289 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL685c G1"), | 289 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL685c G1"), |
| 290 | }, | 290 | }, |
| 291 | }, | 291 | }, |
| 292 | { | ||
| 293 | .callback = set_bf_sort, | ||
| 294 | .ident = "HP ProLiant DL385 G2", | ||
| 295 | .matches = { | ||
| 296 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | ||
| 297 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | ||
| 298 | }, | ||
| 299 | }, | ||
| 300 | { | ||
| 301 | .callback = set_bf_sort, | ||
| 302 | .ident = "HP ProLiant DL585 G2", | ||
| 303 | .matches = { | ||
| 304 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | ||
| 305 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | ||
| 306 | }, | ||
| 307 | }, | ||
| 292 | #ifdef __i386__ | 308 | #ifdef __i386__ |
| 293 | { | 309 | { |
| 294 | .callback = assign_all_busses, | 310 | .callback = assign_all_busses, |