lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/urgent' into x86/cleanups

Browse Source
This commit is contained in:
H. Peter Anvin
2008-08-25 22:45:37 -07:00
parent ed21763e7b 08970fc4e0
commit 94d4ac2f4a
406 changed files with 4406 additions and 3166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/pci/irq.c
View File

@@ -590,6 +590,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
case PCI_DEVICE_ID_INTEL_ICH10_1:
case PCI_DEVICE_ID_INTEL_ICH10_2:
case PCI_DEVICE_ID_INTEL_ICH10_3:
case PCI_DEVICE_ID_INTEL_PCH_0:
case PCI_DEVICE_ID_INTEL_PCH_1:
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;