ia64/linux-2.6.18-xen.hg

changeset 455:87721beab1b9

Reduce diff between arch/i386/pci/irq.c and irq-xen.c.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Feb 28 16:41:41 2008 +0000 (2008-02-28)
parents 57dfe0098000
children 49ffe9ef67d4
files arch/i386/pci/irq-xen.c
line diff
     1.1 --- a/arch/i386/pci/irq-xen.c	Thu Feb 28 13:08:14 2008 +0000
     1.2 +++ b/arch/i386/pci/irq-xen.c	Thu Feb 28 16:41:41 2008 +0000
     1.3 @@ -259,13 +259,13 @@ static int pirq_via_set(struct pci_dev *
     1.4   */
     1.5  static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
     1.6  {
     1.7 -	static const unsigned int pirqmap[4] = { 3, 2, 5, 1 };
     1.8 +	static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
     1.9  	return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
    1.10  }
    1.11  
    1.12  static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
    1.13  {
    1.14 -	static const unsigned int pirqmap[4] = { 3, 2, 5, 1 };
    1.15 +	static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
    1.16  	write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
    1.17  	return 1;
    1.18  }
    1.19 @@ -547,6 +547,12 @@ static __init int intel_router_probe(str
    1.20  		case PCI_DEVICE_ID_INTEL_ICH8_2:
    1.21  		case PCI_DEVICE_ID_INTEL_ICH8_3:
    1.22  		case PCI_DEVICE_ID_INTEL_ICH8_4:
    1.23 +		case PCI_DEVICE_ID_INTEL_ICH9_0:
    1.24 +		case PCI_DEVICE_ID_INTEL_ICH9_1:
    1.25 +		case PCI_DEVICE_ID_INTEL_ICH9_2:
    1.26 +		case PCI_DEVICE_ID_INTEL_ICH9_3:
    1.27 +		case PCI_DEVICE_ID_INTEL_ICH9_4:
    1.28 +		case PCI_DEVICE_ID_INTEL_ICH9_5:
    1.29  			r->name = "PIIX/ICH";
    1.30  			r->get = pirq_piix_get;
    1.31  			r->set = pirq_piix_set;