diff --git a/[refs] b/[refs]
index e6c3c6894f75..02b5e740efe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0214f9221aa06fba35c0cd5c80641b0fcfcb1cbe
+refs/heads/master: df43309bd525bbe569978ca2a47415b7b07ee057
diff --git a/trunk/arch/arm/mach-pxa/time.c b/trunk/arch/arm/mach-pxa/time.c
index ec4286c7931c..a2d45d742ce4 100644
--- a/trunk/arch/arm/mach-pxa/time.c
+++ b/trunk/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;
 	}
 }