diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2011-11-24 13:57:23 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2011-11-28 14:13:06 -0500 |
commit | e5bfb72ce2ce558b5a5a46cc5694001f0479c7f2 (patch) | |
tree | cdbea1fb4d12581913eaa2007618cdf358fd075a /arch/arm/include | |
parent | f2971c4c3197935f409bff202b9ab67416981dd7 (diff) |
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')
-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 065d100fa63e..9275828feb3d 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/byteorder.h> | 27 | #include <asm/byteorder.h> |
28 | #include <asm/memory.h> | 28 | #include <asm/memory.h> |
29 | #include <asm/system.h> | 29 | #include <asm/system.h> |
30 | #include <asm-generic/pci_iomap.h> | ||
30 | 31 | ||
31 | /* | 32 | /* |
32 | * ISA I/O bus memory addresses are 1:1 with the physical address. | 33 | * ISA I/O bus memory addresses are 1:1 with the physical address. |
@@ -306,7 +307,6 @@ extern void ioport_unmap(void __iomem *addr); | |||
306 | 307 | ||
307 | struct pci_dev; | 308 | struct pci_dev; |
308 | 309 | ||
309 | extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen); | ||
310 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); | 310 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); |
311 | 311 | ||
312 | /* | 312 | /* |