diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
| commit | 11cd4cb5f55cdc2f487b8c714610aa3538e28103 (patch) | |
| tree | 81376ff23d9a706c3d4f45e5cf4d213e63abd2ed /arch/arm/plat-s3c24xx/pwm-clock.c | |
| parent | 485bdde78747f7ce2af164406c32db23e4688925 (diff) | |
| parent | 55b404fd78792d7a88d19f2534510ee42841146f (diff) | |
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/plat-s3c24xx/pwm-clock.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pwm-clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index b8e854f1b1d5..3fad68a1e6bc 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
| @@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) | |||
| 315 | if (parent == s3c24xx_pwmclk_tclk(id)) | 315 | if (parent == s3c24xx_pwmclk_tclk(id)) |
| 316 | bits = S3C2410_TCFG1_MUX_TCLK << shift; | 316 | bits = S3C2410_TCFG1_MUX_TCLK << shift; |
| 317 | else if (parent == s3c24xx_pwmclk_tdiv(id)) | 317 | else if (parent == s3c24xx_pwmclk_tdiv(id)) |
| 318 | bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; | 318 | bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift; |
| 319 | else | 319 | else |
| 320 | return -EINVAL; | 320 | return -EINVAL; |
| 321 | 321 | ||