Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / clocksource / metag_generic.c

diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
index 8d06a0f7ff268dc236a5d22500ee2c851bb9ab8a..6fcf96540631d2d9a53a1f64978e99d4cc2f26ab 100644 (file)
--- a/drivers/clocksource/metag_generic.c
+++ b/drivers/clocksource/metag_generic.c
@@ -154,6 +154,6 @@ int __init metag_generic_timer_init(void)
 
        /* Hook cpu boot to configure the CPU's timers */
        return cpuhp_setup_state(CPUHP_AP_METAG_TIMER_STARTING,
-                                "AP_METAG_TIMER_STARTING",
+                                "clockevents/metag:starting",
                                 arch_timer_starting_cpu, NULL);
 }