diff --git a/[refs] b/[refs] index 699ef3e1ad7c..d0c20e2d52fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08aca087f263e8089420b2723fe0c1a0cbe5de0c +refs/heads/master: c564191b1c71d82977ba14ed7f975dae9f6d0001 diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c index 815067b2413e..5ba3cb2daaa0 100644 --- a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c @@ -694,19 +694,19 @@ static struct clk cdce_clk_in = { .rate = CDCE949_XIN_RATE, }; -static struct davinci_clk cdce_clks[] = { +static struct clk_lookup cdce_clks[] = { CLK(NULL, "xin", &cdce_clk_in), CLK(NULL, NULL, NULL), }; static void __init cdce_clk_init(void) { - struct davinci_clk *c; + struct clk_lookup *c; struct clk *clk; - for (c = cdce_clks; c->lk.clk; c++) { - clk = c->lk.clk; - clkdev_add(&c->lk); + for (c = cdce_clks; c->clk; c++) { + clk = c->clk; + clkdev_add(c); clk_register(clk); } }