aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-04-21 14:43:56 -0700
committerStephen Boyd <sboyd@codeaurora.org>2016-04-21 14:43:56 -0700
commite9471c4ecf8a50169216e7232e12b23761ce3d15 (patch)
treed18d1acd815887025a835674e5805a4fdc9dbb82 /include
parentdt-bindings: Add Oxford Semiconductor OXNAS Standard Clocks bindings (diff)
parentclk: composite: Add unregister function (diff)
downloadlinux-dev-e9471c4ecf8a50169216e7232e12b23761ce3d15.tar.xz
linux-dev-e9471c4ecf8a50169216e7232e12b23761ce3d15.zip
Merge branch 'clk-composite-unregister' into clk-next
* clk-composite-unregister: clk: composite: Add unregister function
Diffstat (limited to 'include')
-rw-r--r--include/linux/clk-provider.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 156286445a25..02a8f15b528a 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -604,6 +604,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
unsigned long flags);
+void clk_unregister_composite(struct clk *clk);
/***
* struct clk_gpio_gate - gpio gated clock