projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap1
/
time.c
diff --git
a/arch/arm/mach-omap1/time.c
b/arch/arm/mach-omap1/time.c
index 3705d20c4e5c9b69a8c9c4d01dc2ee7b1c72e1c7..237651ebae5da555be9e346b36f154400d9acaa7 100644
(file)
--- a/
arch/arm/mach-omap1/time.c
+++ b/
arch/arm/mach-omap1/time.c
@@
-156,6
+156,7
@@
static void omap_mpu_set_mode(enum clock_event_mode mode,
break;
case CLOCK_EVT_MODE_UNUSED:
case CLOCK_EVT_MODE_SHUTDOWN:
+ case CLOCK_EVT_MODE_RESUME:
break;
}
}