git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
5b75a79
..
0afb217
100644
(file)
--- a/
arch/arm/plat-s3c24xx/clock-dclk.c
+++ b/
arch/arm/plat-s3c24xx/clock-dclk.c
@@
-129,7
+129,7
@@
static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
/* calculate the MISCCR setting for the clock */
- if (parent == &clk_
xta
l)
+ if (parent == &clk_
mpl
l)
source = S3C2410_MISCCR_CLK0_MPLL;
else if (parent == &clk_upll)
source = S3C2410_MISCCR_CLK0_UPLL;