diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 12:28:23 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 12:28:23 +0400 |
| commit | 2c0b6871008ffa455145affb08bb63f7b47040c3 (patch) | |
| tree | fd8a858a74b1ea4927d1faed2773d30ee6d40b48 /arch/arm/plat-samsung/time.c | |
| parent | 2d21237e38120c2dfbc047b39aa2a56df67bdeec (diff) | |
| parent | e48055999575750158108b4cfc7fc22e4c972efc (diff) | |
| download | linux-2c0b6871008ffa455145affb08bb63f7b47040c3.tar.xz | |
Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-samsung/time.c')
| -rw-r--r-- | arch/arm/plat-samsung/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/time.c b/arch/arm/plat-samsung/time.c index 2231d80ad817..e3bb806bbafe 100644 --- a/arch/arm/plat-samsung/time.c +++ b/arch/arm/plat-samsung/time.c @@ -259,6 +259,8 @@ static void __init s3c2410_timer_resources(void) clk_enable(timerclk); if (!use_tclk1_12()) { + tmpdev.id = 4; + tmpdev.dev.init_name = "s3c24xx-pwm.4"; tin = clk_get(&tmpdev.dev, "pwm-tin"); if (IS_ERR(tin)) panic("failed to get pwm-tin clock for system timer"); |