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/tile | |
| parent | 8704936a70586cc0834ddf35760cd0fe4b65131e (diff) | |
| parent | 8885b7b637fa9aca7e1b00581a0173c6956966d3 (diff) | |
| download | op-kernel-dev-9b9a6d261616bed589302bc6244c5bd7c99a733f.zip op-kernel-dev-9b9a6d261616bed589302bc6244c5bd7c99a733f.tar.gz | |
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/tile')
| -rw-r--r-- | arch/tile/kernel/pci.c | 8 | ||||
| -rw-r--r-- | arch/tile/kernel/pci_gx.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index d2292be..7598226 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -390,14 +390,6 @@ void pcibios_set_master(struct pci_dev *dev) } /* - * 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. * diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 0e213e3..2ba6d05 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -1034,14 +1034,6 @@ char __devinit *pcibios_setup(char *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 * is disabled, though the TILE-Gx supports I/O addressing. |
