Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[karo-tx-linux.git] / arch / arm / mach-davinci / board-dm646x-evm.c

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 815067b2413e6eb12c77fa6a1de113278a39ed3d..5ba3cb2daaa0d71bc8a57a403ab2272b1e515232 100644 (file)
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/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);
        }
 }