]> err.no Git - linux-2.6/commitdiff
ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
authorWill Newton <will.newton@gmail.com>
Tue, 11 Mar 2008 09:47:43 +0000 (09:47 +0000)
committerTony Lindgren <tony@atomide.com>
Thu, 20 Mar 2008 14:57:54 +0000 (16:57 +0200)
Fix typo in OMAP1 MPU clock source initialization.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/time.c

index 572a2dbc72ab765ca3c4b2081071aaee9ddad420..a4f8b2055437af7efe56dbbe85edc4dfa9084331 100644 (file)
@@ -171,7 +171,7 @@ static void omap_mpu_set_mode(enum clock_event_mode mode,
 
 static struct clock_event_device clockevent_mpu_timer1 = {
        .name           = "mpu_timer1",
-       .features       = CLOCK_EVT_FEAT_PERIODIC, CLOCK_EVT_FEAT_ONESHOT,
+       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
        .shift          = 32,
        .set_next_event = omap_mpu_set_next_event,
        .set_mode       = omap_mpu_set_mode,