diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:28:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:28:58 -0800 |
| commit | b1792e367053968f2ddb48bc911d314143ce6242 (patch) | |
| tree | 31ac3fddb0b14a202e9ceaa9681c1335ba35210c /arch | |
| parent | 859281ff370977f917ec2195f86a5bfccf1fc6d6 (diff) | |
| parent | 71a082efc9fdc12068a3cee6cebb1330b00ebeee (diff) | |
| download | op-kernel-dev-b1792e367053968f2ddb48bc911d314143ce6242.zip op-kernel-dev-b1792e367053968f2ddb48bc911d314143ce6242.tar.gz | |
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 hotplug: Change link order of pciehp & acpiphp
PCI hotplug: fakephp: Allocate PCI resources before adding the device
PCI MSI: Fix undefined shift by 32
PCI PM: Do not wait for buses in B2 or B3 during resume
PCI PM: Power up devices before restoring their state
PCI PM: Fix hibernation breakage on EeePC 701
PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs
PCI PM: Fix suspend error paths and testing facility breakage
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/pci/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 4064345..fecbce6 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -572,6 +572,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route case PCI_DEVICE_ID_INTEL_ICH7_1: case PCI_DEVICE_ID_INTEL_ICH7_30: case PCI_DEVICE_ID_INTEL_ICH7_31: + case PCI_DEVICE_ID_INTEL_TGP_LPC: case PCI_DEVICE_ID_INTEL_ESB2_0: case PCI_DEVICE_ID_INTEL_ICH8_0: case PCI_DEVICE_ID_INTEL_ICH8_1: |
