diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-28 22:21:25 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-28 22:21:25 (GMT) |
commit | fdaf36bd360fe1e74b34262ad705ef39d52c12de (patch) | |
tree | b686d69b0c5bf74ac0cd704123d64bfcdb3c10f5 /arch/sh | |
parent | d1a2523d2adc0b6910dbc2a9aed44c4217134db1 (diff) | |
parent | d97ffe236894856d08146390ef3fbe6448a8ac2b (diff) | |
download | linux-fdaf36bd360fe1e74b34262ad705ef39d52c12de.tar.xz |
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/sh')
-rw-r--r-- | arch/sh/include/asm/pci.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index bff96c2..5b45115 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -70,11 +70,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, enum pci_mmap_state mmap_state, int write_combine); extern void pcibios_set_master(struct pci_dev *dev); -static inline void pcibios_penalize_isa_irq(int irq, int active) -{ - /* We don't do dynamic PCI IRQ allocation */ -} - /* Dynamic DMA mapping stuff. * SuperH has everything mapped statically like x86. */ |