From 4846bad679c6710b3314bda547db38e5f9d998bc Mon Sep 17 00:00:00 2001 From: Joshua Coombs Date: Sun, 6 Jan 2013 11:10:39 +0100 Subject: [PATCH] --- yaml --- r: 348465 b: refs/heads/master c: 3810e6304185f5a5bc4bb99b0ed467a28e63e9ed h: refs/heads/master i: 348463: 13202cd69723de2be469aa6aa8cc8c284cbb5a39 v: v3 --- [refs] | 2 +- trunk/drivers/clk/mvebu/clk-gating-ctrl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 73c6ff96f3e8..26b802a87312 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8758c885c43859266e45db588b1a5992c049c595 +refs/heads/master: 3810e6304185f5a5bc4bb99b0ed467a28e63e9ed diff --git a/trunk/drivers/clk/mvebu/clk-gating-ctrl.c b/trunk/drivers/clk/mvebu/clk-gating-ctrl.c index c6d3c263b070..8fa5408b6c7d 100644 --- a/trunk/drivers/clk/mvebu/clk-gating-ctrl.c +++ b/trunk/drivers/clk/mvebu/clk-gating-ctrl.c @@ -32,7 +32,7 @@ struct mvebu_soc_descr { #define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw) -static struct clk __init *mvebu_clk_gating_get_src( +static struct clk *mvebu_clk_gating_get_src( struct of_phandle_args *clkspec, void *data) { struct mvebu_gating_ctrl *ctrl = (struct mvebu_gating_ctrl *)data;