← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/x86/pci/irq.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/pci/irq.c
597
597
                return 1;
598
598
        }
599
599
 
600
 
        if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
601
 
                (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
 
600
        if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN && 
 
601
             device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX) 
 
602
        ||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
 
603
             device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
 
604
        ||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
 
605
             device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
 
606
        ||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
 
607
             device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
602
608
                r->name = "PIIX/ICH";
603
609
                r->get = pirq_piix_get;
604
610
                r->set = pirq_piix_set;
605
611
                return 1;
606
612
        }
607
613
 
608
 
        if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
609
 
                (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
610
 
                r->name = "PIIX/ICH";
611
 
                r->get = pirq_piix_get;
612
 
                r->set = pirq_piix_set;
613
 
                return 1;
614
 
        }
615
614
        return 0;
616
615
}
617
616