aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-21 09:07:13 -0400
committerBen Dooks <ben-linux@fluff.org>2008-12-15 18:19:35 -0500
commitf945ee13cffbee48066e2ac24dbdd1b29a102b51 (patch)
tree7ff5cba85cedf558832290cf2aeb4263ed8c2c6a
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 ===================================================================
-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 0bbc0e2dc5d4..36182fcfaebc 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 = {
68 68
69static struct map_desc s3c_iodesc[] __initdata = { 69static struct map_desc s3c_iodesc[] __initdata = {
70 { 70 {
71 .virtual = S3C_VA_SYS, 71 .virtual = (unsigned long)S3C_VA_SYS,
72 .pfn = __phys_to_pfn(S3C64XX_PA_SYSCON), 72 .pfn = __phys_to_pfn(S3C64XX_PA_SYSCON),
73 .length = SZ_4K, 73 .length = SZ_4K,
74 .type = MT_DEVICE, 74 .type = MT_DEVICE,
@@ -78,22 +78,22 @@ static struct map_desc s3c_iodesc[] __initdata = {
78 .length = SZ_4K, 78 .length = SZ_4K,
79 .type = MT_DEVICE, 79 .type = MT_DEVICE,
80 }, { 80 }, {
81 .virtual = S3C_VA_VIC0, 81 .virtual = (unsigned long)S3C_VA_VIC0,
82 .pfn = __phys_to_pfn(S3C64XX_PA_VIC0), 82 .pfn = __phys_to_pfn(S3C64XX_PA_VIC0),
83 .length = SZ_16K, 83 .length = SZ_16K,
84 .type = MT_DEVICE, 84 .type = MT_DEVICE,
85 }, { 85 }, {
86 .virtual = S3C_VA_VIC1, 86 .virtual = (unsigned long)S3C_VA_VIC1,
87 .pfn = __phys_to_pfn(S3C64XX_PA_VIC1), 87 .pfn = __phys_to_pfn(S3C64XX_PA_VIC1),
88 .length = SZ_16K, 88 .length = SZ_16K,
89 .type = MT_DEVICE, 89 .type = MT_DEVICE,
90 }, { 90 }, {
91 .virtual = S3C_VA_TIMER, 91 .virtual = (unsigned long)S3C_VA_TIMER,
92 .pfn = __phys_to_pfn(S3C_PA_TIMER), 92 .pfn = __phys_to_pfn(S3C_PA_TIMER),
93 .length = SZ_16K, 93 .length = SZ_16K,
94 .type = MT_DEVICE, 94 .type = MT_DEVICE,
95 }, { 95 }, {
96 .virtual = S3C64XX_VA_GPIO, 96 .virtual = (unsigned long)S3C64XX_VA_GPIO,
97 .pfn = __phys_to_pfn(S3C64XX_PA_GPIO), 97 .pfn = __phys_to_pfn(S3C64XX_PA_GPIO),
98 .length = SZ_4K, 98 .length = SZ_4K,
99 .type = MT_DEVICE, 99 .type = MT_DEVICE,