summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-09-19 10:52:37 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-09-19 10:52:37 -0600
commit9b9a6d261616bed589302bc6244c5bd7c99a733f (patch)
tree40c45e75445e724fc2a2281d28a7dd84d7d2ad57 /arch/ia64
parent8704936a70586cc0834ddf35760cd0fe4b65131e (diff)
parent8885b7b637fa9aca7e1b00581a0173c6956966d3 (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/ia64')
-rw-r--r--arch/ia64/pci/pci.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 81acc7a57f3..a7ebe944027 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -461,14 +461,6 @@ void pcibios_set_master (struct pci_dev *dev)
/* No special bus mastering setup handling */
}
-void __devinit
-pcibios_update_irq (struct pci_dev *dev, int irq)
-{
- pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-
- /* ??? FIXME -- record old value for shutdown. */
-}
-
int
pcibios_enable_device (struct pci_dev *dev, int mask)
{