From 2fe218b196db8d46512ce41aca389556ceb7a55e Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Tue, 8 Sep 2009 14:30:48 +0900 Subject: [PATCH] --- yaml --- r: 166133 b: refs/heads/master c: 6d025ac2fcf9d736ee399efddae74a3362dfa7da h: refs/heads/master i: 166131: 44e33f21c69515f14a951afde687d501535ddbfc v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6dc725fa39e5..36a34ff0e65e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9adb15b80bf1dc6b30a584e76efc876dfd029a13 +refs/heads/master: 6d025ac2fcf9d736ee399efddae74a3362dfa7da diff --git a/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c b/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c index c972d2f8c271..54eef9326c21 100644 --- a/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c @@ -328,6 +328,8 @@ static int s3c64xx_setparent_clksrc(struct clk *clk, struct clk *parent) clksrc |= src_nr << sclk->shift; __raw_writel(clksrc, S3C_CLK_SRC); + + clk->parent = parent; return 0; }