diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 10:52:37 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 10:52:37 -0600 |
| commit | 9b9a6d261616bed589302bc6244c5bd7c99a733f (patch) | |
| tree | 40c45e75445e724fc2a2281d28a7dd84d7d2ad57 /arch/arm | |
| parent | 8704936a70586cc0834ddf35760cd0fe4b65131e (diff) | |
| parent | 8885b7b637fa9aca7e1b00581a0173c6956966d3 (diff) | |
Merge branch 'pci/thierry-fixup-irqs' into next
* pci/thierry-fixup-irqs:
PCI: Provide a default pcibios_update_irq()
PCI: Discard __init annotations for pci_fixup_irqs() and related functions
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 2b2f25e7fef..9cf16b83bbb 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -270,15 +270,6 @@ static void __devinit pci_fixup_it8152(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8152, pci_fixup_it8152); - - -void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) -{ - if (debug_pci) - printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev)); - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); -} - /* * If the bus contains any of these devices, then we must not turn on * parity checking of any kind. Currently this is CyberPro 20x0 only. |