diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:04 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:04 -0400 |
| commit | c733a7179cacdf77be9c1eeef02d6e0833919d89 (patch) | |
| tree | 8d6404926c4673014fd63946d1028605cdd02e45 /arch/arm/mach-s3c64xx | |
| parent | 359542b2a1d8a945c135c2c4ea4434ce69fc2723 (diff) | |
| parent | 14894b9b8317d9a337bba55998fdef1c9b2dc63d (diff) | |
ARM: Merge for-2635/samsung-dma
Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 33ccf7bf766a..5567e037b0d1 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
| @@ -414,7 +414,7 @@ err_buff: | |||
| 414 | EXPORT_SYMBOL(s3c2410_dma_enqueue); | 414 | EXPORT_SYMBOL(s3c2410_dma_enqueue); |
| 415 | 415 | ||
| 416 | 416 | ||
| 417 | int s3c2410_dma_devconfig(int channel, | 417 | int s3c2410_dma_devconfig(unsigned int channel, |
| 418 | enum s3c2410_dmasrc source, | 418 | enum s3c2410_dmasrc source, |
| 419 | unsigned long devaddr) | 419 | unsigned long devaddr) |
| 420 | { | 420 | { |