diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-08 11:49:09 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 11:49:09 -0700 |
| commit | 743a6d923f803c861a24d173e1d1818ca8ac0384 (patch) | |
| tree | 29a1c1e8a6a45f7b9319de9155d5346603ee202b /arch/arm/mach-omap2/timer.c | |
| parent | 1df82cd6d7673006ae2ecbe8745bcf44f61c53a8 (diff) | |
| parent | 0135f6a04642c192bdf4b36e06937d3387e174ff (diff) | |
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm
Some OMAP PRCM updates for 3.5. Includes some clock, clockdomain,
powerdomain, PRM, and CM changes.
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index ecec873e78c..1b7835865c8 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -178,13 +178,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (IS_ERR(timer->fclk)) return -ENODEV; - sprintf(name, "gpt%d_ick", gptimer_id); - timer->iclk = clk_get(NULL, name); - if (IS_ERR(timer->iclk)) { - clk_put(timer->fclk); - return -ENODEV; - } - omap_hwmod_enable(oh); sys_timer_reserved |= (1 << (gptimer_id - 1)); |