Merge branch 'topic/oss' into for-linus

[pandora-kernel.git] / arch / arm / plat-s3c24xx / clock-dclk.c

diff --git a/arch/arm/plat-s3c24xx/clock-dclk.c b/arch/arm/plat-s3c24xx/clock-dclk.c
index 35219dc..0afb217 100644 (file)
--- a/arch/arm/plat-s3c24xx/clock-dclk.c
+++ b/arch/arm/plat-s3c24xx/clock-dclk.c
@@ -18,7 +18,6 @@
 
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
-#include <mach/hardware.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
@@ -130,7 +129,7 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
 
        /* calculate the MISCCR setting for the clock */
 
-       if (parent == &clk_xtal)
+       if (parent == &clk_mpll)
                source = S3C2410_MISCCR_CLK0_MPLL;
        else if (parent == &clk_upll)
                source = S3C2410_MISCCR_CLK0_UPLL;