diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 02:09:46 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 02:09:46 +0900 |
| commit | cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4 (patch) | |
| tree | 8e485f710138a330a56285b2a17d7debadf81c9b /arch/arm/plat-samsung/time.c | |
| parent | b5930b83c2791bd3b2da120f98f844f96fb2ca50 (diff) | |
| parent | e48055999575750158108b4cfc7fc22e4c972efc (diff) | |
| download | talos-obmc-linux-cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4.tar.gz talos-obmc-linux-cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4.zip | |
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) 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"); |
