aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk/versatile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-19 17:11:08 +0100
committerMark Brown <broonie@linaro.org>2013-07-19 17:11:08 +0100
commit70ca852fcdefc60de2e238c0ef4c0fe66b1f4fcc (patch)
tree776ce6c950ce20f2259c89c454d990e4f7ee8556 /drivers/clk/versatile
parent702f80ea2f3c335b94589ec18f249542e438ffb0 (diff)
parentca872d5c4d01f842b91bb5c8cb3d8d3c990e39ff (diff)
downloadvexpress-lsk-70ca852fcdefc60de2e238c0ef4c0fe66b1f4fcc.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Diffstat (limited to 'drivers/clk/versatile')
-rw-r--r--drivers/clk/versatile/clk-vexpress-spc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-spc.c b/drivers/clk/versatile/clk-vexpress-spc.c
index 37125bf48cb..bb566e244b0 100644
--- a/drivers/clk/versatile/clk-vexpress-spc.c
+++ b/drivers/clk/versatile/clk-vexpress-spc.c
@@ -102,7 +102,7 @@ struct clk *vexpress_clk_register_spc(const char *name, int cluster_id)
#if defined(CONFIG_OF)
void __init vexpress_clk_of_register_spc(void)
{
- char name[14] = "cpu-cluster.";
+ char name[14] = "cpu-cluster.X";
struct device_node *node = NULL;
struct clk *clk;
const u32 *val;