diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 18:52:37 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 18:52:37 +0200 |
commit | 9b9a6d261616bed589302bc6244c5bd7c99a733f (patch) | |
tree | 40c45e75445e724fc2a2281d28a7dd84d7d2ad57 /arch/ia64 | |
parent | Merge branch 'pci/konstantin-sysfs' into next (diff) | |
parent | PCI: Provide a default pcibios_update_irq() (diff) | |
download | linux-9b9a6d261616bed589302bc6244c5bd7c99a733f.tar.xz linux-9b9a6d261616bed589302bc6244c5bd7c99a733f.zip |
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 81acc7a57f3e..a7ebe9440271 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) { |