diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
| commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
| tree | 8f7f591754baa934a842357e75e773a525bfb147 /arch/arm/mach-pxa/time.c | |
| parent | f6ab0b922c3423b88c0e6e3e2c5fc1e58d83055d (diff) | |
| parent | 54866f032307063776b4eff7eadb131d47f9f9b4 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index ec4286c7931..a2d45d742ce 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@ -151,6 +151,9 @@ pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) OIER &= ~OIER_E0; raw_local_irq_restore(irqflags); break; + + case CLOCK_EVT_MODE_RESUME: + break; } } |