diff options
| author | Will Newton <will.newton@gmail.com> | 2008-03-11 12:47:43 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-03-20 17:57:54 +0300 |
| commit | c6b349ed8a288f1f69fdd560d509d81351cafd89 (patch) | |
| tree | e414088c29148ea838d859e3351a8bf5911df8a9 /arch/arm | |
| parent | 026a6fef55da7239ca0970000eb62b9eab5ba281 (diff) | |
| download | linux-c6b349ed8a288f1f69fdd560d509d81351cafd89.tar.xz | |
ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap1/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 572a2dbc72ab..a4f8b2055437 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -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, |