summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-21 14:07:13 +0100
committerBen Dooks <ben-linux@fluff.org>2008-12-15 23:19:35 +0000
commitf945ee13cffbee48066e2ac24dbdd1b29a102b51 (patch)
tree7ff5cba85cedf558832290cf2aeb4263ed8c2c6a /arch
parent39669f594e75997db6a893c1e4a1c05312661fe2 (diff)
[ARM] S3C64XX: Fix warnings from map_io initilaisers
Discard the 'void *' from the pointers used for the virtual addresses when setting up the .virtual fields of the io map to avoid implicit cast warnings Signed-off-by: Ben Dooks <ben-linux@fluff.org> Index: linux.git/arch/arm/plat-s3c64xx/cpu.c ===================================================================
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c64xx/cpu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c64xx/cpu.c b/arch/arm/plat-s3c64xx/cpu.c
index 0bbc0e2dc5d..36182fcfaeb 100644
--- a/arch/arm/plat-s3c64xx/cpu.c
+++ b/arch/arm/plat-s3c64xx/cpu.c
@@ -68,7 +68,7 @@ static struct cpu_table cpu_ids[] __initdata = {
static struct map_desc s3c_iodesc[] __initdata = {
{
- .virtual = S3C_VA_SYS,
+ .virtual = (unsigned long)S3C_VA_SYS,
.pfn = __phys_to_pfn(S3C64XX_PA_SYSCON),
.length = SZ_4K,
.type = MT_DEVICE,
@@ -78,22 +78,22 @@ static struct map_desc s3c_iodesc[] __initdata = {
.length = SZ_4K,
.type = MT_DEVICE,
}, {
- .virtual = S3C_VA_VIC0,
+ .virtual = (unsigned long)S3C_VA_VIC0,
.pfn = __phys_to_pfn(S3C64XX_PA_VIC0),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
- .virtual = S3C_VA_VIC1,
+ .virtual = (unsigned long)S3C_VA_VIC1,
.pfn = __phys_to_pfn(S3C64XX_PA_VIC1),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
- .virtual = S3C_VA_TIMER,
+ .virtual = (unsigned long)S3C_VA_TIMER,
.pfn = __phys_to_pfn(S3C_PA_TIMER),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
- .virtual = S3C64XX_VA_GPIO,
+ .virtual = (unsigned long)S3C64XX_VA_GPIO,
.pfn = __phys_to_pfn(S3C64XX_PA_GPIO),
.length = SZ_4K,
.type = MT_DEVICE,