diff --git a/[refs] b/[refs]
index fbba2159a1af..2df152857ae1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5307c9556bc17e3cd26d4e94fc3b2565921834de
+refs/heads/master: e5400321a6f15ce0fe77c8455954f213ef7dcc54
diff --git a/trunk/include/linux/clockchips.h b/trunk/include/linux/clockchips.h
index 81e803e90aa4..acba894374a1 100644
--- a/trunk/include/linux/clockchips.h
+++ b/trunk/include/linux/clockchips.h
@@ -132,6 +132,7 @@ extern u64 clockevent_delta2ns(unsigned long latch,
 			       struct clock_event_device *evt);
 extern void clockevents_register_device(struct clock_event_device *dev);
 
+extern void clockevents_config(struct clock_event_device *dev, u32 freq);
 extern void clockevents_config_and_register(struct clock_event_device *dev,
 					    u32 freq, unsigned long min_delta,
 					    unsigned long max_delta);
diff --git a/trunk/kernel/time/clockevents.c b/trunk/kernel/time/clockevents.c
index 9cd928f7a7c6..7e1ce012a851 100644
--- a/trunk/kernel/time/clockevents.c
+++ b/trunk/kernel/time/clockevents.c
@@ -297,8 +297,7 @@ void clockevents_register_device(struct clock_event_device *dev)
 }
 EXPORT_SYMBOL_GPL(clockevents_register_device);
 
-static void clockevents_config(struct clock_event_device *dev,
-			       u32 freq)
+void clockevents_config(struct clock_event_device *dev, u32 freq)
 {
 	u64 sec;