Merge tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[deliverable/linux.git] / drivers / clocksource / dw_apb_timer.c

diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index 63345260244d7d97df303b3fd12445612e6b4395..797505aa2ba41263f5f2080f9b777f383b744bfe 100644 (file)
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -264,6 +264,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating,
        dw_ced->ced.set_state_shutdown = apbt_shutdown;
        dw_ced->ced.set_state_periodic = apbt_set_periodic;
        dw_ced->ced.set_state_oneshot = apbt_set_oneshot;
+       dw_ced->ced.set_state_oneshot_stopped = apbt_shutdown;
        dw_ced->ced.tick_resume = apbt_resume;
        dw_ced->ced.set_next_event = apbt_next_event;
        dw_ced->ced.irq = dw_ced->timer.irq;