projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
pci
/
irq.c
diff --git
a/arch/x86/pci/irq.c
b/arch/x86/pci/irq.c
index a60deb6e6696b6bbcbda159977c3a19b3aede20e..8b107521d24e63f235cdd86ddf4ee86826e36ded 100644
(file)
--- a/
arch/x86/pci/irq.c
+++ b/
arch/x86/pci/irq.c
@@
-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_CPT_LPC1:
+ case PCI_DEVICE_ID_INTEL_CPT_LPC2:
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;