redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Adrian Bunk 2006-12-19 13:01:28 -08:00 committed by Greg Kroah-Hartman
parent 542cfce6f3
commit 1f21782e63
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/ibm_acpi.c
View File

@ -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,
},
{

2
include/linux/device.h
View File

@ -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
*/

2
init/main.c
View File

@ -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);