diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 12:52:37 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 12:52:37 -0400 |
commit | 9b9a6d261616bed589302bc6244c5bd7c99a733f (patch) | |
tree | 40c45e75445e724fc2a2281d28a7dd84d7d2ad57 /arch/mips/pci | |
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/mips/pci')
-rw-r--r-- | arch/mips/pci/pci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 690356808f8a..04e35bcde07c 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
@@ -313,12 +313,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | void __init | ||
317 | pcibios_update_irq(struct pci_dev *dev, int irq) | ||
318 | { | ||
319 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | ||
320 | } | ||
321 | |||
322 | #ifdef CONFIG_HOTPLUG | 316 | #ifdef CONFIG_HOTPLUG |
323 | EXPORT_SYMBOL(PCIBIOS_MIN_IO); | 317 | EXPORT_SYMBOL(PCIBIOS_MIN_IO); |
324 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); | 318 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); |