git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-imx
/
clk-busy.c
diff --git
a/arch/arm/mach-imx/clk-busy.c
b/arch/arm/mach-imx/clk-busy.c
index 85b728cc27abc4db782328f9a0524cb08abc759a..4bb1bc419b798e5323652d36c0cf1413e45ccf31 100644
(file)
--- a/
arch/arm/mach-imx/clk-busy.c
+++ b/
arch/arm/mach-imx/clk-busy.c
@@
-147,7
+147,7
@@
static int clk_busy_mux_set_parent(struct clk_hw *hw, u8 index)
return ret;
}
-struct clk_ops clk_busy_mux_ops = {
+st
atic st
ruct clk_ops clk_busy_mux_ops = {
.get_parent = clk_busy_mux_get_parent,
.set_parent = clk_busy_mux_set_parent,
};