diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:06 +1100 |
| commit | 36a71789f61edc2ad31b2d09c579c583570ec13a (patch) | |
| tree | 45d9a495b75a6bfa2dc4f0dbbdecfa28a743bd21 /arch/arm/mach-davinci | |
| parent | 13deb4d4c7ab99dd6ff44dd55694f00449a5d37e (diff) | |
| parent | a85634521a654b0d1216b1e8722148329eb905be (diff) | |
Merge remote branch 'arm/devel'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c index 49912b48b1b0..a1c0b6b99edf 100644 --- a/arch/arm/mach-davinci/io.c +++ b/arch/arm/mach-davinci/io.c @@ -24,7 +24,7 @@ void __iomem *davinci_ioremap(unsigned long p, size_t size, unsigned int type) if (BETWEEN(p, IO_PHYS, IO_SIZE)) return XLATE(p, IO_PHYS, IO_VIRT); - return __arm_ioremap(p, size, type); + return __arm_ioremap_caller(p, size, type, __builtin_return_address(0)); } EXPORT_SYMBOL(davinci_ioremap); |