diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 12:52:37 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-19 12:52:37 -0400 |
| commit | 9b9a6d261616bed589302bc6244c5bd7c99a733f (patch) | |
| tree | 40c45e75445e724fc2a2281d28a7dd84d7d2ad57 /arch/sh | |
| 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/sh')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 40db2d0aef3f..a7e078f2e2e4 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
| @@ -192,11 +192,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
| 192 | return pci_enable_resources(dev, mask); | 192 | return pci_enable_resources(dev, mask); |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | void __init pcibios_update_irq(struct pci_dev *dev, int irq) | ||
| 196 | { | ||
| 197 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | ||
| 198 | } | ||
| 199 | |||
| 200 | static void __init | 195 | static void __init |
| 201 | pcibios_bus_report_status_early(struct pci_channel *hose, | 196 | pcibios_bus_report_status_early(struct pci_channel *hose, |
| 202 | int top_bus, int current_bus, | 197 | int top_bus, int current_bus, |