projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-spear6xx
/
spear6xx.c
diff --git
a/arch/arm/mach-spear6xx/spear6xx.c
b/arch/arm/mach-spear6xx/spear6xx.c
index b59ae5369e7bb3900c9f4a6dcbdd267d48a9a38c..5a5a52db252bf79d6d776c4a2cbdbbf330ba9e43 100644
(file)
--- a/
arch/arm/mach-spear6xx/spear6xx.c
+++ b/
arch/arm/mach-spear6xx/spear6xx.c
@@
-376,7
+376,7
@@
void __init spear6xx_map_io(void)
static void __init spear6xx_timer_init(void)
{
- char pclk_name[] = "pll3_
48m_
clk";
+ char pclk_name[] = "pll3_clk";
struct clk *gpt_clk, *pclk;
spear6xx_clk_init();