diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2010-05-06 15:14:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-08 10:44:21 +0100 |
| commit | b1a9ceb2e003aab7b96e30d990c1092453a0ea44 (patch) | |
| tree | 89a9e816273c5e0a835f22e5d864343ac14a1334 | |
| parent | f1c448e0a9e99c76f4ece368714fb35a40a8daba (diff) | |
| download | linux-stable-b1a9ceb2e003aab7b96e30d990c1092453a0ea44.tar.gz linux-stable-b1a9ceb2e003aab7b96e30d990c1092453a0ea44.tar.bz2 linux-stable-b1a9ceb2e003aab7b96e30d990c1092453a0ea44.zip | |
ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c
Commit 31aa8fd6 introduced the __arm_ioremap_caller() function but the
nommu.c version did not have the _caller suffix.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 9bfeb6b9509a..f8791eed7594 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -87,8 +87,8 @@ void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size, } EXPORT_SYMBOL(__arm_ioremap); -void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size, - unsigned int mtype, void *caller) +void __iomem *__arm_ioremap_caller(unsigned long phys_addr, size_t size, + unsigned int mtype, void *caller) { return __arm_ioremap(phys_addr, size, mtype); } |