summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-02-18 22:18:52 -0800
committerMike Turquette <mturquette@linaro.org>2014-02-18 22:18:52 -0800
commit7364001478597759fc5e00536bbe926ec9c25db0 (patch)
treed77eea329b52b89a241f75dcdf3a71effef74cd9 /drivers/clk
parent37a4493ee73b93c4d25e57d5ac975e4cb48165f5 (diff)
parent565bbdcd3b91523b4142587c00206302e091a23e (diff)
downloadop-kernel-dev-7364001478597759fc5e00536bbe926ec9c25db0.zip
op-kernel-dev-7364001478597759fc5e00536bbe926ec9c25db0.tar.gz
Merge branch 'for_3.14-rcx/clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-fixes
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/keystone/gate.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c
index 17a5983..86f1e36 100644
--- a/drivers/clk/keystone/gate.c
+++ b/drivers/clk/keystone/gate.c
@@ -179,6 +179,7 @@ static struct clk *clk_register_psc(struct device *dev,
init.name = name;
init.ops = &clk_psc_ops;
+ init.flags = 0;
init.parent_names = (parent_name ? &parent_name : NULL);
init.num_parents = (parent_name ? 1 : 0);
OpenPOWER on IntegriCloud