git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c24xx
/
dma.c
diff --git
a/arch/arm/plat-s3c24xx/dma.c
b/arch/arm/plat-s3c24xx/dma.c
index 93827b3d4e84645bbc34212578140978f7014642..6ad274e7593d578a23161f30eba62d88b396d5f5 100644
(file)
--- 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)
{