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/sparc/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/sparc/kernel/pci.c')
| -rw-r--r-- | arch/sparc/kernel/pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 065b88c4f86..acc8c838ff7 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -622,10 +622,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus) { } -void pcibios_update_irq(struct pci_dev *pdev, int irq) -{ -} - resource_size_t pcibios_align_resource(void *data, const struct resource *res, resource_size_t size, resource_size_t align) { |