diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2011-11-24 20:57:23 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2011-11-28 21:13:06 +0200 |
commit | e5bfb72ce2ce558b5a5a46cc5694001f0479c7f2 (patch) | |
tree | cdbea1fb4d12581913eaa2007618cdf358fd075a /arch/arm/include/asm/io.h | |
parent | f2971c4c3197935f409bff202b9ab67416981dd7 (diff) | |
download | op-kernel-dev-e5bfb72ce2ce558b5a5a46cc5694001f0479c7f2.zip op-kernel-dev-e5bfb72ce2ce558b5a5a46cc5694001f0479c7f2.tar.gz |
arm: switch to GENERIC_PCI_IOMAP
arm copied pci_iomap from generic code, probably to avoid
pulling the rest of iomap.c in. Since that's in
a separate file now, we can reuse the common implementation.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/arm/include/asm/io.h')
-rw-r--r-- | arch/arm/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 065d100..9275828 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -27,6 +27,7 @@ #include <asm/byteorder.h> #include <asm/memory.h> #include <asm/system.h> +#include <asm-generic/pci_iomap.h> /* * ISA I/O bus memory addresses are 1:1 with the physical address. @@ -306,7 +307,6 @@ extern void ioport_unmap(void __iomem *addr); struct pci_dev; -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen); extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); /* |