releases/upstream/2.6.22-rc1/0013-ACPI-thinkpad-acpi-rename-register_ibmacpi_subdriv.patch

   1 From 6700121b535fa16fe1c8aaac03559b2f12909726 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Sat, 21 Apr 2007 11:08:25 -0300
   4 Subject: ACPI: thinkpad-acpi: rename register_ibmacpi_subdriver
   5
   6 Rename register_ibmacpi_subdriver to register_tpacpi_subdriver, as
   7 we are not called ibmacpi anymore.
   8
   9 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  10 Signed-off-by: Len Brown <len.brown@intel.com>
  11 ---
  12  drivers/misc/thinkpad_acpi.c |    4 ++--
  13  drivers/misc/thinkpad_acpi.h |    2 +-
  14  2 files changed, 3 insertions(+), 3 deletions(-)
  15
  16 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  17 index ddaedf8..cac73e5 100644
  18 --- a/drivers/misc/thinkpad_acpi.c
  19 +++ b/drivers/misc/thinkpad_acpi.c
  20 @@ -345,7 +345,7 @@ static int __init ibm_device_add(struct acpi_device *device)
  21         return 0;
  22  }
  23
  24 -static int __init register_ibmacpi_subdriver(struct ibm_struct *ibm)
  25 +static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
  26  {
  27         int ret;
  28
  29 @@ -2574,7 +2574,7 @@ static int __init ibm_init(struct ibm_struct *ibm)
  30                 return 0;
  31
  32         if (ibm->hid) {
  33 -               ret = register_ibmacpi_subdriver(ibm);
  34 +               ret = register_tpacpi_subdriver(ibm);
  35                 if (ret < 0)
  36                         return ret;
  37                 ibm->driver_registered = 1;
  38 diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
  39 index 015c02b..b86e574 100644
  40 --- a/drivers/misc/thinkpad_acpi.h
  41 +++ b/drivers/misc/thinkpad_acpi.h
  42 @@ -157,7 +157,7 @@ static void ibm_exit(struct ibm_struct *ibm);
  43  static void dispatch_notify(acpi_handle handle, u32 event, void *data);
  44  static int setup_notify(struct ibm_struct *ibm);
  45  static int ibm_device_add(struct acpi_device *device);
  46 -static int register_ibmacpi_subdriver(struct ibm_struct *ibm);
  47 +static int register_tpacpi_subdriver(struct ibm_struct *ibm);
  48
  49
  50  /*
  51 --
  52 1.5.1
  53