diff --git a/[refs] b/[refs]
index 35a2ae949b0d..19d6ff50b2c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8e62deeb98713fcce903662a66b16bd04dc602
+refs/heads/master: e6171bbe4d5683960221d42c87195cbd366de4bf
diff --git a/trunk/arch/blackfin/kernel/time-ts.c b/trunk/arch/blackfin/kernel/time-ts.c
index 6efd944a2f33..d98f2d69b0c4 100644
--- a/trunk/arch/blackfin/kernel/time-ts.c
+++ b/trunk/arch/blackfin/kernel/time-ts.c
@@ -282,24 +282,6 @@ void bfin_coretmr_init(void)
 __attribute__((l1_text))
 #endif
 
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
-		struct clock_event_device *evt)
-{
-}
-
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
-{
-	evt->name       = "dummy_timer";
-	evt->features   = CLOCK_EVT_FEAT_ONESHOT |
-		CLOCK_EVT_FEAT_PERIODIC |
-		CLOCK_EVT_FEAT_DUMMY;
-	evt->rating     = 400;
-	evt->mult       = 1;
-	evt->set_mode   = broadcast_timer_set_mode;
-
-	clockevents_register_device(evt);
-}
-
 irqreturn_t bfin_coretmr_interrupt(int irq, void *dev_id)
 {
 	int cpu = smp_processor_id();