diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2015-10-13 11:18:17 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-10-13 11:18:17 -0400 |
commit | 52fa1927e953d8b1fbdcf8a19dc75c1499cc3d5d (patch) | |
tree | 4b5bed95549ed3de324878039f990d547a2c41ee | |
parent | 03875ad52fdde1f110f663470a45d3dcc34b8fef (diff) |
Revert "arm64: ioremap: add ioremap_cache macro"
This reverts commit 1b6d7f8742d5d46c478f10c9e57da18d049b116d.
This patch would conflict with Dan Williams' "tree-wide convert to
memremap()" series (ioremap_cache replaced by arch_memremap)
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | arch/arm64/include/asm/io.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index d6b620c9a112..44be1e03ed65 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h | |||
@@ -172,7 +172,6 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); | |||
172 | #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) | 172 | #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) |
173 | #define ioremap_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) | 173 | #define ioremap_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) |
174 | #define iounmap __iounmap | 174 | #define iounmap __iounmap |
175 | #define ioremap_cache ioremap_cache | ||
176 | 175 | ||
177 | /* | 176 | /* |
178 | * io{read,write}{16,32}be() macros | 177 | * io{read,write}{16,32}be() macros |