From 2bf0fd6ef94101c37fd0cf0eafa426ff58e1d8c6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 7 May 2007 00:00:37 -0700
Subject: [PATCH] --- yaml --- r: 54406 b: refs/heads/master c:
 23abc9ec6a4fbcb3da5475f9f4c25415c466de08 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc64/kernel/central.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 69fb31434a92..bfa7281e83ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a5b518f222449e707e553573f937faf6e57f03d
+refs/heads/master: 23abc9ec6a4fbcb3da5475f9f4c25415c466de08
diff --git a/trunk/arch/sparc64/kernel/central.c b/trunk/arch/sparc64/kernel/central.c
index c65b2f9c98d8..8230099f0d8a 100644
--- a/trunk/arch/sparc64/kernel/central.c
+++ b/trunk/arch/sparc64/kernel/central.c
@@ -98,7 +98,7 @@ void apply_central_ranges(struct linux_central *central,
 			    central->num_central_ranges);
 }
 
-void * __init central_alloc_bootmem(unsigned long size)
+static void * __init central_alloc_bootmem(unsigned long size)
 {
 	void *ret;
 
@@ -116,7 +116,7 @@ static unsigned long prom_reg_to_paddr(struct linux_prom_registers *r)
 	return ret | (unsigned long) r->phys_addr;
 }
 
-static void probe_other_fhcs(void)
+static void __init probe_other_fhcs(void)
 {
 	struct device_node *dp;
 	const struct linux_prom64_registers *fpregs;
@@ -298,7 +298,7 @@ static void init_all_fhc_hw(void)
 
 }
 
-void central_probe(void)
+void __init central_probe(void)
 {
 	struct linux_prom_registers fpregs[6];
 	const struct linux_prom_registers *pr;