From 2cfc0450cbe8535ffb4844f0f8be800776664785 Mon Sep 17 00:00:00 2001
From: Li Jie <eltshanli@gmail.com>
Date: Thu, 5 Nov 2009 07:29:54 -0800
Subject: [PATCH] --- yaml --- r: 168505 b: refs/heads/master c:
 6de95c198729d34a85c88f8844f1c3d57fb6da00 h: refs/heads/master i:   168503:
 b1bc56766fd87fc3a5eedd294e77acfd5075e0c4 v: v3

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

diff --git a/[refs] b/[refs]
index 8e6fc78740a3..382f1773f831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d8965557318fabb1680d1817c2afc2714b6d3ce
+refs/heads/master: 6de95c198729d34a85c88f8844f1c3d57fb6da00
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
index 0acb61f3c10b..7177c4aa6342 100644
--- a/trunk/arch/arm/mach-kirkwood/common.c
+++ b/trunk/arch/arm/mach-kirkwood/common.c
@@ -845,7 +845,7 @@ int __init kirkwood_find_tclk(void)
 	return 166666667;
 }
 
-static void kirkwood_timer_init(void)
+static void __init kirkwood_timer_init(void)
 {
 	kirkwood_tclk = kirkwood_find_tclk();
 	orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
diff --git a/trunk/arch/arm/mach-kirkwood/pcie.c b/trunk/arch/arm/mach-kirkwood/pcie.c
index d90b9aae308d..553882033006 100644
--- a/trunk/arch/arm/mach-kirkwood/pcie.c
+++ b/trunk/arch/arm/mach-kirkwood/pcie.c
@@ -93,7 +93,7 @@ static struct pci_ops pcie_ops = {
 };
 
 
-static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
+static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
 {
 	struct resource *res;
 	extern unsigned int kirkwood_clk_ctrl;