git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
dma.c
diff --git
a/arch/arm/mach-s3c64xx/dma.c
b/arch/arm/mach-s3c64xx/dma.c
index
67c97fa
..
17d62f4
100644
(file)
--- a/
arch/arm/mach-s3c64xx/dma.c
+++ b/
arch/arm/mach-s3c64xx/dma.c
@@
-740,7
+740,7
@@
static int __init s3c64xx_dma_init(void)
}
/* Set all DMA configuration to be DMA, not SDMA */
- writel(0xffffff, S3C
_SYSREG(0x110)
);
+ writel(0xffffff, S3C
64XX_SDMA_SEL
);
/* Register standard DMA controllers */
s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000);