projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
clk
/
shmobile
/
clk-mstp.c
diff --git
a/drivers/clk/shmobile/clk-mstp.c
b/drivers/clk/shmobile/clk-mstp.c
index
42d5912
..
2e5810c
100644
(file)
--- a/
drivers/clk/shmobile/clk-mstp.c
+++ b/
drivers/clk/shmobile/clk-mstp.c
@@
-137,7
+137,7
@@
cpg_mstp_clock_register(const char *name, const char *parent_name,
init.name = name;
init.ops = &cpg_mstp_clock_ops;
- init.flags = CLK_IS_BASIC;
+ init.flags = CLK_IS_BASIC
| CLK_SET_RATE_PARENT
;
init.parent_names = &parent_name;
init.num_parents = 1;