diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2014-05-06 11:29:52 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 16:23:58 -0600 |
| commit | a43ae58c848cfbadaba81c8d63202b4487f922a0 (patch) | |
| tree | 142ac300293f2771444b91b6f077a0bfea622058 /arch/ia64/include/asm/pci.h | |
| parent | 78916b00f0096059c872f537306b1a464c84fb30 (diff) | |
| download | blackbird-op-linux-a43ae58c848cfbadaba81c8d63202b4487f922a0.tar.gz blackbird-op-linux-a43ae58c848cfbadaba81c8d63202b4487f922a0.zip | |
PCI: Turn pcibios_penalize_isa_irq() into a weak function
pcibios_penalize_isa_irq() is only implemented by x86 now, and legacy ISA
is not used by some architectures. Make pcibios_penalize_isa_irq() a
__weak function to simplify the code. This removes the need for new
platforms to add stub implementations of pcibios_penalize_isa_irq().
[bhelgaas: changelog, comments]
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/ia64/include/asm/pci.h')
| -rw-r--r-- | arch/ia64/include/asm/pci.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 7d41cc089822..52af5ed9f60b 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -50,12 +50,6 @@ struct pci_dev; extern unsigned long ia64_max_iommu_merge_mask; #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL) -static inline void -pcibios_penalize_isa_irq (int irq, int active) -{ - /* We don't do dynamic PCI IRQ allocation */ -} - #include <asm-generic/pci-dma-compat.h> #ifdef CONFIG_PCI |
