diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2010-05-06 10:14:09 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-08 05:44:21 -0400 |
commit | b1a9ceb2e003aab7b96e30d990c1092453a0ea44 (patch) | |
tree | 89a9e816273c5e0a835f22e5d864343ac14a1334 /arch/arm/mm | |
parent | f1c448e0a9e99c76f4ece368714fb35a40a8daba (diff) |
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>
Diffstat (limited to 'arch/arm/mm')
-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, | |||
87 | } | 87 | } |
88 | EXPORT_SYMBOL(__arm_ioremap); | 88 | EXPORT_SYMBOL(__arm_ioremap); |
89 | 89 | ||
90 | void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size, | 90 | void __iomem *__arm_ioremap_caller(unsigned long phys_addr, size_t size, |
91 | unsigned int mtype, void *caller) | 91 | unsigned int mtype, void *caller) |
92 | { | 92 | { |
93 | return __arm_ioremap(phys_addr, size, mtype); | 93 | return __arm_ioremap(phys_addr, size, mtype); |
94 | } | 94 | } |