summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:04 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:04 +0900
commitc733a7179cacdf77be9c1eeef02d6e0833919d89 (patch)
tree8d6404926c4673014fd63946d1028605cdd02e45 /arch/arm/plat-s3c24xx
parent359542b2a1d8a945c135c2c4ea4434ce69fc2723 (diff)
parent14894b9b8317d9a337bba55998fdef1c9b2dc63d (diff)
ARM: Merge for-2635/samsung-dma
Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 93827b3d4e8..6ad274e7593 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1104,7 +1104,7 @@ EXPORT_SYMBOL(s3c2410_dma_config);
* devaddr: physical address of the source
*/
-int s3c2410_dma_devconfig(int channel,
+int s3c2410_dma_devconfig(unsigned int channel,
enum s3c2410_dmasrc source,
unsigned long devaddr)
{