summaryrefslogtreecommitdiffstats
path: root/arch/frv/include
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-11-29 21:20:06 +0200
committerMichael S. Tsirkin <mst@redhat.com>2011-12-04 16:00:12 +0200
commit5322418502be4696ebdef2ed164bbd0a348d4816 (patch)
treef5a2e2ea9b1988c2ed811e46573f9bb0d8630b7c /arch/frv/include
parent845501213033d0058945776349f15502823359d8 (diff)
downloadblackbird-op-linux-5322418502be4696ebdef2ed164bbd0a348d4816.tar.gz
blackbird-op-linux-5322418502be4696ebdef2ed164bbd0a348d4816.zip
frv: switch to GENERIC_PCI_IOMAP
frv uses a version of pci_iomap that simply casts and returns back the start address. Looking closely, both ioremap and ioport_map seem to do this on this platform, so the generic pci_iomap will DTRT automatically. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/frv/include')
-rw-r--r--arch/frv/include/asm/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h
index ca7475e73b5e..8cb50a2fbcb2 100644
--- a/arch/frv/include/asm/io.h
+++ b/arch/frv/include/asm/io.h
@@ -21,6 +21,7 @@
#include <asm/virtconvert.h>
#include <asm/string.h>
#include <asm/mb-regs.h>
+#include <asm-generic/pci_iomap.h>
#include <linux/delay.h>
/*
@@ -370,7 +371,6 @@ static inline void iowrite32_rep(void __iomem *p, const void *src, unsigned long
/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
{
}
OpenPOWER on IntegriCloud