From c6042cddb667541e4d60fcd43168c301d084f850 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Wed, 27 Jun 2012 11:29:54 +0900 Subject: [PATCH] --- yaml --- r: 313216 b: refs/heads/master c: 3688be49e901551756f4c570a8eb3b98b1e2bbe5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/dma-ops.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2475399ec66c..cd14945acc3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21c4afed6acc35deed6db3989f992c17712cd00e +refs/heads/master: 3688be49e901551756f4c570a8eb3b98b1e2bbe5 diff --git a/trunk/arch/arm/plat-samsung/dma-ops.c b/trunk/arch/arm/plat-samsung/dma-ops.c index f9eb353d768c..c38d75489240 100644 --- a/trunk/arch/arm/plat-samsung/dma-ops.c +++ b/trunk/arch/arm/plat-samsung/dma-ops.c @@ -36,8 +36,7 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch, return (unsigned)dma_request_channel(mask, pl330_filter, filter_param); } -static int samsung_dmadev_release(unsigned ch, - struct s3c2410_dma_client *client) +static int samsung_dmadev_release(unsigned ch, void *param) { dma_release_channel((struct dma_chan *)ch);