Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-block.git] / drivers / clk / clk-pwm.c

diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c
index 328fcfcefd8c5f0303457dfee3201ebd5d5550c0..883045814dac2536fcb667b36e3db01d8715596e 100644 (file)
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c
@@ -95,7 +95,7 @@ static int clk_pwm_probe(struct platform_device *pdev)
 
        init.name = clk_name;
        init.ops = &clk_pwm_ops;
-       init.flags = CLK_IS_BASIC | CLK_IS_ROOT;
+       init.flags = CLK_IS_BASIC;
        init.num_parents = 0;
 
        clk_pwm->pwm = pwm;