summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/io.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:41 +0100
commit2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch)
tree4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/plat-omap/io.c
parentMerge branch 'perf' into devel (diff)
parentARM: Eliminate decompressor -Dstatic= PIC hack (diff)
downloadlinux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.xz
linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/plat-omap/io.c')
-rw-r--r--arch/arm/plat-omap/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index 0cfd54f519c4..4cbd4fb3232c 100644
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -128,7 +128,7 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
return XLATE(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_VIRT);
}
#endif
- return __arm_ioremap(p, size, type);
+ return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
}
EXPORT_SYMBOL(omap_ioremap);