aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-04-21 10:08:25 -0400
committerLen Brown <len.brown@intel.com>2007-04-21 23:30:32 -0400
commit6700121b535fa16fe1c8aaac03559b2f12909726 (patch)
treefb93324790db0446d8b4874a5d7a8074f9c57892
parent756970ad4bb93027a60da2de9b43d094b7f387a2 (diff)
ACPI: thinkpad-acpi: rename register_ibmacpi_subdriver
Rename register_ibmacpi_subdriver to register_tpacpi_subdriver, as we are not called ibmacpi anymore. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/misc/thinkpad_acpi.c4
-rw-r--r--drivers/misc/thinkpad_acpi.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index ddaedf80d873..cac73e5f96e2 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -345,7 +345,7 @@ static int __init ibm_device_add(struct acpi_device *device)
345 return 0; 345 return 0;
346} 346}
347 347
348static int __init register_ibmacpi_subdriver(struct ibm_struct *ibm) 348static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
349{ 349{
350 int ret; 350 int ret;
351 351
@@ -2574,7 +2574,7 @@ static int __init ibm_init(struct ibm_struct *ibm)
2574 return 0; 2574 return 0;
2575 2575
2576 if (ibm->hid) { 2576 if (ibm->hid) {
2577 ret = register_ibmacpi_subdriver(ibm); 2577 ret = register_tpacpi_subdriver(ibm);
2578 if (ret < 0) 2578 if (ret < 0)
2579 return ret; 2579 return ret;
2580 ibm->driver_registered = 1; 2580 ibm->driver_registered = 1;
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 015c02beb203..b86e5740aba4 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -157,7 +157,7 @@ static void ibm_exit(struct ibm_struct *ibm);
157static void dispatch_notify(acpi_handle handle, u32 event, void *data); 157static void dispatch_notify(acpi_handle handle, u32 event, void *data);
158static int setup_notify(struct ibm_struct *ibm); 158static int setup_notify(struct ibm_struct *ibm);
159static int ibm_device_add(struct acpi_device *device); 159static int ibm_device_add(struct acpi_device *device);
160static int register_ibmacpi_subdriver(struct ibm_struct *ibm); 160static int register_tpacpi_subdriver(struct ibm_struct *ibm);
161 161
162 162
163/* 163/*