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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
clock.c
diff --git
a/arch/arm/mach-ux500/clock.c
b/arch/arm/mach-ux500/clock.c
index
1b2c989
..
6544855
100644
(file)
--- a/
arch/arm/mach-ux500/clock.c
+++ b/
arch/arm/mach-ux500/clock.c
@@
-411,7
+411,7
@@
static struct clk_lookup u8500_common_clks[] = {
CLK(apetraceclk, "apetrace", NULL),
CLK(mcdeclk, "mcde", NULL),
CLK(ipi2clk, "ipi2", NULL),
- CLK(dmaclk, "dma40
",
NULL),
+ CLK(dmaclk, "dma40
.0",
NULL),
CLK(b2r2clk, "b2r2", NULL),
CLK(tvclk, "tv", NULL),
};