aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5p64x0/include/mach
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 17:27:13 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-20 17:31:50 +0200
commitb86e007eebbea791beba59fa167113fc0091c2c4 (patch)
treee7ff0a91da85fc959b3c25834de8941a17e29f15 /arch/arm/mach-s5p64x0/include/mach
parentdc30f7c3acc486572dfa7dbd70aa955a56066c66 (diff)
downloadlinux-linaro-stable-b86e007eebbea791beba59fa167113fc0091c2c4.tar.gz
ARM: s5p64x0: avoid build warning for uncompress.h
Commit 5336539 "ARM: S5P64X0: Use common uncompress.h part for plat-samsung" was missing a type cast, this brings it in line with the other samsung platforms. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5p64x0/include/mach')
-rw-r--r--arch/arm/mach-s5p64x0/include/mach/uncompress.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/uncompress.h b/arch/arm/mach-s5p64x0/include/mach/uncompress.h
index bc04bd5d1a29..bbcc3f669ee3 100644
--- a/arch/arm/mach-s5p64x0/include/mach/uncompress.h
+++ b/arch/arm/mach-s5p64x0/include/mach/uncompress.h
@@ -23,9 +23,9 @@ static void arch_detect_cpu(void)
chipid = *(const volatile unsigned int __force *) 0xE0100118;
if ((chipid & 0xff000) == 0x50000)
- uart_base = S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
+ uart_base = (volatile u8 *)S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
else
- uart_base = S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
+ uart_base = (volatile u8 *)S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
fifo_mask = S3C2440_UFSTAT_TXMASK;
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;