From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Bunk Subject: [2.6 patch] proper prototype for drivers/base/init.c:driver_init() Date: Sat, 25 Nov 2006 20:16:45 +0100 Message-ID: <20061125191645.GI3702@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailout.stusta.mhn.de ([141.84.69.5]:1037 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S967135AbWKYTQm (ORCPT ); Sat, 25 Nov 2006 14:16:42 -0500 Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, ibm-acpi@hmh.eng.br, len.brown@intel.com, linux-acpi@vger.kernel.org This patch adds a prototype for driver_init() in include/linux/device.h. It also removes 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 --- drivers/acpi/ibm_acpi.c | 4 ++-- include/linux/device.h | 2 ++ init/main.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) --- linux-2.6.19-rc6-mm1/include/linux/device.h.old 2006-11-25 00:03:22.000000000 +0100 +++ linux-2.6.19-rc6-mm1/include/linux/device.h 2006-11-25 00:04:06.000000000 +0100 @@ -432,6 +432,8 @@ return dev->is_registered; } +void driver_init(void); + /* * High level routines for use by the bus drivers */ --- linux-2.6.19-rc6-mm1/init/main.c.old 2006-11-25 00:05:03.000000000 +0100 +++ linux-2.6.19-rc6-mm1/init/main.c 2006-11-25 00:05:58.000000000 +0100 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -90,7 +91,6 @@ extern void radix_tree_init(void); extern void free_initmem(void); extern void populate_rootfs(void); -extern void driver_init(void); extern void prepare_namespace(void); #ifdef CONFIG_ACPI extern void acpi_early_init(void); --- linux-2.6.19-rc6-mm1/drivers/acpi/ibm_acpi.c.old 2006-11-25 00:06:12.000000000 +0100 +++ linux-2.6.19-rc6-mm1/drivers/acpi/ibm_acpi.c 2006-11-25 00:06:37.000000000 +0100 @@ -355,7 +355,7 @@ 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); @@ -1634,7 +1634,7 @@ static struct ibm_struct ibms[] = { { .name = "driver", - .init = driver_init, + .init = ibm_acpi_driver_init, .read = driver_read, }, {