summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-19 13:01:28 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-20 10:56:45 -0800
commit1f21782e63da81f56401a813a52091ef2703838f (patch)
tree8a01f16d84fe3ec10182d4f8b987f1c7beecd414 /init
parent542cfce6f36e8c43f71ae9c235b78497f350ae55 (diff)
downloadop-kernel-dev-1f21782e63da81f56401a813a52091ef2703838f.zip
op-kernel-dev-1f21782e63da81f56401a813a52091ef2703838f.tar.gz
Driver core: proper prototype for drivers/base/init.c:driver_init()
Add a prototype for driver_init() in include/linux/device.h. Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to ibm_acpi_driver_init() to fix the namespace collision. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index e3f0bb2..2b1cdaa 100644
--- a/init/main.c
+++ b/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);
OpenPOWER on IntegriCloud