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/alpha/kernel/pci.c | |
| 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/alpha/kernel/pci.c')
| -rw-r--r-- | arch/alpha/kernel/pci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 9816d5a4d176..ef757147cbf9 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -256,12 +256,6 @@ pcibios_fixup_bus(struct pci_bus *bus) } } -void __init -pcibios_update_irq(struct pci_dev *dev, int irq) -{ - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); -} - int pcibios_enable_device(struct pci_dev *dev, int mask) { |