summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-05-28 16:21:25 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-05-28 16:21:25 -0600
commitfdaf36bd360fe1e74b34262ad705ef39d52c12de (patch)
treeb686d69b0c5bf74ac0cd704123d64bfcdb3c10f5 /arch/ia64
parentd1a2523d2adc0b6910dbc2a9aed44c4217134db1 (diff)
parentd97ffe236894856d08146390ef3fbe6448a8ac2b (diff)
downloadlinux-fdaf36bd360fe1e74b34262ad705ef39d52c12de.tar.bz2
Merge branch 'pci/misc' into next
* pci/misc: PCI: Fix return value from pci_user_{read,write}_config_*() PCI: Turn pcibios_penalize_isa_irq() into a weak function PCI: Test for std config alias when testing extended config space
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/pci.h6
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