diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-12-19 13:01:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-20 10:56:45 -0800 |
| commit | 1f21782e63da81f56401a813a52091ef2703838f (patch) | |
| tree | 8a01f16d84fe3ec10182d4f8b987f1c7beecd414 | |
| parent | 542cfce6f36e8c43f71ae9c235b78497f350ae55 (diff) | |
| download | op-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>
| -rw-r--r-- | drivers/acpi/ibm_acpi.c | 4 | ||||
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | init/main.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 003a987..5a84459 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/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/include/linux/device.h b/include/linux/device.h index 49ab53c..f44247f 100644 --- a/include/linux/device.h +++ b/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/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); |
