diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
| commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
| tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/mach-davinci | |
| parent | bc85e585c6d0fab4bde12d60964b2f25802c3163 (diff) | |
| parent | 5de813b6cd06460b337f9da9afe316823cf3ef45 (diff) | |
| download | op-kernel-dev-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip op-kernel-dev-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.gz | |
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/io.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index 41c8938..c45ba1f 100644 --- a/arch/arm/mach-davinci/include/mach/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h @@ -27,7 +27,7 @@ /* * I/O mapping */ -#define IO_PHYS 0x01c00000 +#define IO_PHYS 0x01c00000UL #define IO_OFFSET 0xfd000000 /* Virtual IO = 0xfec00000 */ #define IO_SIZE 0x00400000 #define IO_VIRT (IO_PHYS + IO_OFFSET) diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c index 49912b4..a1c0b6b 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); |
