---

yaml --- r: 44828 b: refs/heads/master c: 1f21782 h: refs/heads/master v: v3
git-mirror · Dec 20, 2006 · 6e671ac · 6e671ac
1 parent 116e8a3
commit 6e671ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 542cfce6f36e8c43f71ae9c235b78497f350ae55
+refs/heads/master: 1f21782e63da81f56401a813a52091ef2703838f
diff --git a/trunk/drivers/acpi/ibm_acpi.c b/trunk/drivers/acpi/ibm_acpi.c
@@ -352,7 +352,7 @@ static char *next_cmd(char **cmds)
 	return start;
 }
 
-static int driver_init(void)
+static int ibm_acpi_driver_init(void)
 {
 	printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
 	printk(IBM_INFO "%s\n", IBM_URL);
@@ -1605,7 +1605,7 @@ static int fan_write(char *buf)
 static struct ibm_struct ibms[] = {
 	{
 	 .name = "driver",
-	 .init = driver_init,
+	 .init = ibm_acpi_driver_init,
 	 .read = driver_read,
 	 },
 	{

diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
@@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev)
 	return dev->is_registered;
 }
 
+void driver_init(void);
+
 /*
  * High level routines for use by the bus drivers
  */

diff --git a/trunk/init/main.c b/trunk/init/main.c
@@ -53,6 +53,7 @@
 #include <linux/utsrelease.h>
 #include <linux/pid_namespace.h>
 #include <linux/compile.h>
+#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -94,7 +95,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void driver_init(void);
 extern void prepare_namespace(void);
 #ifdef	CONFIG_ACPI
 extern void acpi_early_init(void);
-Original file line number
+Diff line change
@@ Expand Up / @@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev) @@
     	return dev->is_registered;
     }
+    void driver_init(void);
     /*
      * High level routines for use by the bus drivers
      */
@@ Expand Down @@