diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-20 13:09:46 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-20 13:09:46 -0400 |
| commit | cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4 (patch) | |
| tree | 8e485f710138a330a56285b2a17d7debadf81c9b /arch/arm/plat-samsung/time.c | |
| parent | b5930b83c2791bd3b2da120f98f844f96fb2ca50 (diff) | |
| parent | e48055999575750158108b4cfc7fc22e4c972efc (diff) | |
Merge branch 'next-samsung-clkdev-fix' into next-samsung-cleanup
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) | |||
| 259 | clk_enable(timerclk); | 259 | clk_enable(timerclk); |
| 260 | 260 | ||
| 261 | if (!use_tclk1_12()) { | 261 | if (!use_tclk1_12()) { |
| 262 | tmpdev.id = 4; | ||
| 263 | tmpdev.dev.init_name = "s3c24xx-pwm.4"; | ||
| 262 | tin = clk_get(&tmpdev.dev, "pwm-tin"); | 264 | tin = clk_get(&tmpdev.dev, "pwm-tin"); |
| 263 | if (IS_ERR(tin)) | 265 | if (IS_ERR(tin)) |
| 264 | panic("failed to get pwm-tin clock for system timer"); | 266 | panic("failed to get pwm-tin clock for system timer"); |