From 65b65f3ce19e4c010775538a37fab4c33f8b9680 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 29 Jan 2010 15:30:53 -0700 Subject: [PATCH] --- yaml --- r: 187419 b: refs/heads/master c: 639b9be60ec2045a0a59b2ea33479937c4b5acef h: refs/heads/master i: 187417: 4714a4ecf4e0b2ae8e81f0864d807cc239f9a899 187415: 8ffd822bc656df1a4e977f86e67d08854ee3f70c v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-dove/common.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 890398d93714..a6273f0779e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e3e65fc425588a4a4b9143d7dfe40e52a2bf0be +refs/heads/master: 639b9be60ec2045a0a59b2ea33479937c4b5acef diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c index 806972a68c87..5da2cf402c81 100644 --- a/trunk/arch/arm/mach-dove/common.c +++ b/trunk/arch/arm/mach-dove/common.c @@ -605,7 +605,7 @@ static struct platform_device dove_xor00_channel = { .dev = { .dma_mask = &dove_xor0_dmamask, .coherent_dma_mask = DMA_BIT_MASK(64), - .platform_data = (void *)&dove_xor00_data, + .platform_data = &dove_xor00_data, }, }; @@ -631,7 +631,7 @@ static struct platform_device dove_xor01_channel = { .dev = { .dma_mask = &dove_xor0_dmamask, .coherent_dma_mask = DMA_BIT_MASK(64), - .platform_data = (void *)&dove_xor01_data, + .platform_data = &dove_xor01_data, }, }; @@ -704,7 +704,7 @@ static struct platform_device dove_xor10_channel = { .dev = { .dma_mask = &dove_xor1_dmamask, .coherent_dma_mask = DMA_BIT_MASK(64), - .platform_data = (void *)&dove_xor10_data, + .platform_data = &dove_xor10_data, }, }; @@ -730,7 +730,7 @@ static struct platform_device dove_xor11_channel = { .dev = { .dma_mask = &dove_xor1_dmamask, .coherent_dma_mask = DMA_BIT_MASK(64), - .platform_data = (void *)&dove_xor11_data, + .platform_data = &dove_xor11_data, }, };