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/plat-samsung | |
| 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/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h index 7584d751ed51..2e8f8c6560d7 100644 --- a/arch/arm/plat-samsung/include/plat/dma.h +++ b/arch/arm/plat-samsung/include/plat/dma.h | |||
| @@ -110,8 +110,8 @@ extern int s3c2410_dma_config(unsigned int channel, int xferunit); | |||
| 110 | * configure the device we're talking to | 110 | * configure the device we're talking to |
| 111 | */ | 111 | */ |
| 112 | 112 | ||
| 113 | extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source, | 113 | extern int s3c2410_dma_devconfig(unsigned int channel, |
| 114 | unsigned long devaddr); | 114 | enum s3c2410_dmasrc source, unsigned long devaddr); |
| 115 | 115 | ||
| 116 | /* s3c2410_dma_getposition | 116 | /* s3c2410_dma_getposition |
| 117 | * | 117 | * |