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 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
clock-s5p6440.c
diff --git
a/arch/arm/mach-s5p64x0/clock-s5p6440.c
b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index
c1f548f
..
c54c65d
100644
(file)
--- a/
arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/
arch/arm/mach-s5p64x0/clock-s5p6440.c
@@
-147,6
+147,7
@@
static struct clk init_clocks_off[] = {
.ctrlbit = (1 << 8),
}, {
.name = "dma",
+ .devname = "dma-pl330",
.parent = &clk_hclk_low.clk,
.enable = s5p64x0_hclk0_ctrl,
.ctrlbit = (1 << 12),