diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 12:35:18 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 12:35:18 +0200 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap1/time.c | |
| parent | omap: mcbsp: Drop in-driver transfer support (diff) | |
| parent | omap2+: Rename timer-gp.c into timer.c to combine timer init functions (diff) | |
| download | linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.xz linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.zip | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
| -rw-r--r-- | arch/arm/mach-omap1/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 03e1e1062ad4..a1837771e031 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -297,7 +297,7 @@ static inline int omap_32k_timer_usable(void) * Timer initialization * --------------------------------------------------------------------------- */ -static void __init omap_timer_init(void) +static void __init omap1_timer_init(void) { if (omap_32k_timer_usable()) { preferred_sched_clock_init(1); @@ -307,6 +307,6 @@ static void __init omap_timer_init(void) } } -struct sys_timer omap_timer = { - .init = omap_timer_init, +struct sys_timer omap1_timer = { + .init = omap1_timer_init, }; |