From 1065ed947362c22aa892bed5b95fa4c9f1f2496d Mon Sep 17 00:00:00 2001 From: Davide Rizzo Date: Sat, 3 May 2008 07:53:14 +0100 Subject: [PATCH] --- yaml --- r: 96359 b: refs/heads/master c: bdd0f5f06e7647b545bec3ead2fa2a5fcdf0f0f9 h: refs/heads/master i: 96357: 7876323cebe4f65a68d08b6d7ae67bf0b17d2f04 96355: ab09c8a962397918f0ad827a65aac28c8be2fa54 96351: b2153dd619c8c962663f832cb31dd9c20d1fdc10 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/clock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 420ad0d28d32..0a3306ea1ab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 649de51b883746d76c5fa1614dd067054c9d702a +refs/heads/master: bdd0f5f06e7647b545bec3ead2fa2a5fcdf0f0f9 diff --git a/trunk/arch/arm/plat-s3c24xx/clock.c b/trunk/arch/arm/plat-s3c24xx/clock.c index d84167fb33b1..3ac8d8d781b3 100644 --- a/trunk/arch/arm/plat-s3c24xx/clock.c +++ b/trunk/arch/arm/plat-s3c24xx/clock.c @@ -411,7 +411,7 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) clk->parent = parent; - if (clk == &s3c24xx_dclk0) + if (clk == &s3c24xx_clkout0) mask = S3C2410_MISCCR_CLK0_MASK; else { source <<= 4; @@ -437,7 +437,7 @@ struct clk s3c24xx_dclk0 = { struct clk s3c24xx_dclk1 = { .name = "dclk1", .id = -1, - .ctrlbit = S3C2410_DCLKCON_DCLK0EN, + .ctrlbit = S3C2410_DCLKCON_DCLK1EN, .enable = s3c24xx_dclk_enable, .set_parent = s3c24xx_dclk_setparent, .set_rate = s3c24xx_set_dclk_rate,