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

arch/tile/kernel/pci.c

@@ -389,14 +389,6 @@ void pcibios_set_master(struct pci_dev *dev)
 	/* No special bus mastering setup handling. */
 }
 
-/*
- * This is called from the generic Linux layer.
- */
-void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
-
 /*
  * Enable memory and/or address decoding, as appropriate, for the
  * device described by the 'dev' struct.

arch/tile/kernel/pci_gx.c

@@ -1033,14 +1033,6 @@ char __devinit *pcibios_setup(char *str)
 	return str;
 }
 
-/*
- * This is called from the generic Linux layer.
- */
-void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
-
 /*
  * Enable memory address decoding, as appropriate, for the
  * device described by the 'dev' struct. The I/O decoding