diff --git a/[refs] b/[refs]
index ae0e05d963ac..2d0c7fbb8913 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7472c389ee1044d04af8a5b7c51aa7af96ed2db
+refs/heads/master: 10d29ff9070caf5810d37ab06e30f7acad278f1e
diff --git a/trunk/arch/sparc/include/asm/starfire.h b/trunk/arch/sparc/include/asm/starfire.h
index 07bafd31e33c..d56ce60a5992 100644
--- a/trunk/arch/sparc/include/asm/starfire.h
+++ b/trunk/arch/sparc/include/asm/starfire.h
@@ -12,7 +12,6 @@
 extern int this_is_starfire;
 
 extern void check_if_starfire(void);
-extern void starfire_cpu_setup(void);
 extern int starfire_hard_smp_processor_id(void);
 extern void starfire_hookup(int);
 extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid);
diff --git a/trunk/arch/sparc64/kernel/central.c b/trunk/arch/sparc64/kernel/central.c
index f2e87d0d7e1d..68c91b232bec 100644
--- a/trunk/arch/sparc64/kernel/central.c
+++ b/trunk/arch/sparc64/kernel/central.c
@@ -306,11 +306,8 @@ void __init central_probe(void)
 	int err;
 
 	dp = of_find_node_by_name(NULL, "central");
-	if (!dp) {
-		if (this_is_starfire)
-			starfire_cpu_setup();
+	if (!dp)
 		return;
-	}
 
 	/* Ok we got one, grab some memory for software state. */
 	central_bus = (struct linux_central *)
diff --git a/trunk/arch/sparc64/kernel/starfire.c b/trunk/arch/sparc64/kernel/starfire.c
index 7461581b3bb9..060d0f3a6151 100644
--- a/trunk/arch/sparc64/kernel/starfire.c
+++ b/trunk/arch/sparc64/kernel/starfire.c
@@ -28,11 +28,6 @@ void check_if_starfire(void)
 		this_is_starfire = 1;
 }
 
-void starfire_cpu_setup(void)
-{
-	/* Currently, nothing to do.  */
-}
-
 int starfire_hard_smp_processor_id(void)
 {
 	return upa_readl(0x1fff40000d0UL);