From 266718eb1348aec0404cf8a834bb5d185fa325cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 16 Jul 2012 22:07:06 +0200 Subject: [PATCH] --- yaml --- r: 313595 b: refs/heads/master c: de9c51593f88a5c375de9eb896dc4f26e6830e39 h: refs/heads/master i: 313593: 00ea13056dee60437bb9bbce767de8a91fa25da7 313591: 2cbd10044e4728b910b337508273f8f73697397c v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/time.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c82c9c7340fb..7ad39d6ab4f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0c29dce6eb5c837a40c2cf1ed2a0aa7f2221afe +refs/heads/master: de9c51593f88a5c375de9eb896dc4f26e6830e39 diff --git a/trunk/arch/arm/plat-mxc/time.c b/trunk/arch/arm/plat-mxc/time.c index 00e8e659e667..a17abcf98325 100644 --- a/trunk/arch/arm/plat-mxc/time.c +++ b/trunk/arch/arm/plat-mxc/time.c @@ -160,7 +160,8 @@ static const char *clock_event_mode_label[] = { [CLOCK_EVT_MODE_PERIODIC] = "CLOCK_EVT_MODE_PERIODIC", [CLOCK_EVT_MODE_ONESHOT] = "CLOCK_EVT_MODE_ONESHOT", [CLOCK_EVT_MODE_SHUTDOWN] = "CLOCK_EVT_MODE_SHUTDOWN", - [CLOCK_EVT_MODE_UNUSED] = "CLOCK_EVT_MODE_UNUSED" + [CLOCK_EVT_MODE_UNUSED] = "CLOCK_EVT_MODE_UNUSED", + [CLOCK_EVT_MODE_RESUME] = "CLOCK_EVT_MODE_RESUME", }; #endif /* DEBUG */