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

[karo-tx-linux.git] / arch / mips / jz4740 / time.c

diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index 03dfd4e0da4e6079777e5776f11f5ab6fc4ff2b0..f83c2dd07a2732ab61972d353546bdbad137b307 100644 (file)
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -89,7 +89,7 @@ static int jz4740_clockevent_set_next(unsigned long evt,
 
 static struct clock_event_device jz4740_clockevent = {
        .name = "jz4740-timer",
-       .features = CLOCK_EVT_FEAT_PERIODIC,
+       .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
        .set_next_event = jz4740_clockevent_set_next,
        .set_mode = jz4740_clockevent_set_mode,
        .rating = 200,