aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ibm_acpi.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-19 16:01:28 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-20 13:56:45 -0500
commit1f21782e63da81f56401a813a52091ef2703838f (patch)
tree8a01f16d84fe3ec10182d4f8b987f1c7beecd414 /drivers/acpi/ibm_acpi.c
parent542cfce6f36e8c43f71ae9c235b78497f350ae55 (diff)
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 'drivers/acpi/ibm_acpi.c')
-rw-r--r--drivers/acpi/ibm_acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 003a9876c968..5a8445959f67 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -352,7 +352,7 @@ static char *next_cmd(char **cmds)
352 return start; 352 return start;
353} 353}
354 354
355static int driver_init(void) 355static int ibm_acpi_driver_init(void)
356{ 356{
357 printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); 357 printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
358 printk(IBM_INFO "%s\n", IBM_URL); 358 printk(IBM_INFO "%s\n", IBM_URL);
@@ -1605,7 +1605,7 @@ static int fan_write(char *buf)
1605static struct ibm_struct ibms[] = { 1605static struct ibm_struct ibms[] = {
1606 { 1606 {
1607 .name = "driver", 1607 .name = "driver",
1608 .init = driver_init, 1608 .init = ibm_acpi_driver_init,
1609 .read = driver_read, 1609 .read = driver_read,
1610 }, 1610 },
1611 { 1611 {