From 1b0e5ed2c5ad1dba7737d43fe66aee26fd329e3d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 15:44:12 +0000
Subject: [PATCH] --- yaml --- r: 333293 b: refs/heads/master c:
 e7215fb33acfba65f0a83a2cf3c58c529e042078 h: refs/heads/master i:   333291:
 ae27d67781d2f06dca399f6e61498a2abdd06996 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-mv78xx0/common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e6915e0e7d8..614a747de264 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 673550a19f01c7955a1321ed9f43a4e2fd9cabf6
+refs/heads/master: e7215fb33acfba65f0a83a2cf3c58c529e042078
diff --git a/trunk/arch/arm/mach-mv78xx0/common.c b/trunk/arch/arm/mach-mv78xx0/common.c
index 3057f7d4329a..e251ebc72289 100644
--- a/trunk/arch/arm/mach-mv78xx0/common.c
+++ b/trunk/arch/arm/mach-mv78xx0/common.c
@@ -341,7 +341,7 @@ void __init mv78xx0_init_early(void)
 	orion_time_set_base(TIMER_VIRT_BASE);
 }
 
-static void mv78xx0_timer_init(void)
+static void __init_refok mv78xx0_timer_init(void)
 {
 	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
 			IRQ_MV78XX0_TIMER_1, get_tclk());