From 66ed30b218ec57709945bd4342cda2ff8d754ba8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 30 Aug 2008 01:18:56 -0700
Subject: [PATCH] --- yaml --- r: 113071 b: refs/heads/master c:
 c510b9bfa1c34c1452f7a4389ff6de4f72a78193 h: refs/heads/master i:   113069:
 f1635fbdb599ecbab25e12e6c9c85f195f20b7e0   113067:
 68cba9b80041ac82b6c055814ad47be3aeefdf6a   113063:
 a3281268e2205a88de74634dd7865eae248b1264   113055:
 95dad3376b7077e8023a7734e51fe292227e22db v: v3

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

diff --git a/[refs] b/[refs]
index b2597afe349c..00d30ee4f751 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0ac612e6997429a21887475709ca6d6224971f2
+refs/heads/master: c510b9bfa1c34c1452f7a4389ff6de4f72a78193
diff --git a/trunk/arch/sparc64/kernel/pci.c b/trunk/arch/sparc64/kernel/pci.c
index 218778617ee4..83c50a62970d 100644
--- a/trunk/arch/sparc64/kernel/pci.c
+++ b/trunk/arch/sparc64/kernel/pci.c
@@ -799,8 +799,6 @@ static void __init pci_scan_each_controller_bus(void)
 		pbm->scan_bus(pbm);
 }
 
-extern void power_init(void);
-
 static int __init pcibios_init(void)
 {
 	pci_controller_probe();
@@ -809,8 +807,6 @@ static int __init pcibios_init(void)
 
 	pci_scan_each_controller_bus();
 
-	power_init();
-
 	return 0;
 }
 
diff --git a/trunk/arch/sparc64/kernel/power.c b/trunk/arch/sparc64/kernel/power.c
index 3bb987a6d03c..7536255ab573 100644
--- a/trunk/arch/sparc64/kernel/power.c
+++ b/trunk/arch/sparc64/kernel/power.c
@@ -1,29 +1,22 @@
 /* power.c: Power management driver.
  *
- * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
-#include <linux/syscalls.h>
 #include <linux/reboot.h>
 #include <linux/of_device.h>
 
-#include <asm/system.h>
 #include <asm/auxio.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/sstate.h>
 #include <asm/reboot.h>
 
-#include <linux/unistd.h>
-
 /*
  * sysctl - toggle power-off restriction for serial console 
  * systems in machine_power_off()
@@ -111,8 +104,9 @@ static struct of_platform_driver power_driver = {
 	},
 };
 
-void __init power_init(void)
+static int __init power_init(void)
 {
-	of_register_driver(&power_driver, &of_platform_bus_type);
-	return;
+	return of_register_driver(&power_driver, &of_platform_bus_type);
 }
+
+device_initcall(power_init);