releases/upstream/2.6.20-rc2/0027-Driver-core-proper-prototype-for-drivers-base-init.c-driver_init.txt

   1 From 1f21782e63da81f56401a813a52091ef2703838f Mon Sep 17 00:00:00 2001
   2 From: Adrian Bunk <bunk@stusta.de>
   3 Date: Tue, 19 Dec 2006 13:01:28 -0800
   4 Subject: [PATCH 27/28] Driver core: proper prototype for drivers/base/init.c:driver_init()
   5
   6 Add a prototype for driver_init() in include/linux/device.h.
   7
   8 Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to
   9 ibm_acpi_driver_init() to fix the namespace collision.
  10
  11 Signed-off-by: Adrian Bunk <bunk@stusta.de>
  12 Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  13 Signed-off-by: Andrew Morton <akpm@osdl.org>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15 ---
  16  drivers/acpi/ibm_acpi.c |    4 ++--
  17  1 files changed, 2 insertions(+), 2 deletions(-)
  18
  19 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
  20 index 003a987..5a84459 100644
  21 --- a/drivers/acpi/ibm_acpi.c
  22 +++ b/drivers/acpi/ibm_acpi.c
  23 @@ -352,7 +352,7 @@ static char *next_cmd(char **cmds)
  24         return start;
  25  }
  26
  27 -static int driver_init(void)
  28 +static int ibm_acpi_driver_init(void)
  29  {
  30         printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
  31         printk(IBM_INFO "%s\n", IBM_URL);
  32 @@ -1605,7 +1605,7 @@ static int fan_write(char *buf)
  33  static struct ibm_struct ibms[] = {
  34         {
  35          .name = "driver",
  36 -        .init = driver_init,
  37 +        .init = ibm_acpi_driver_init,
  38          .read = driver_read,
  39          },
  40         {
  41 --
  42 1.4.4.2
  43