diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-03-29 01:58:40 -0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-03-30 15:35:41 -0400 |
| commit | f21f85de4b3b9ad4a671fb19a889c16db2ea38b2 (patch) | |
| tree | b6bceb2c727eab930f7df2a30f49e21fb333a64e | |
| parent | 3ede41c718c7845905231019e42d05a3ed329515 (diff) | |
| download | linux-3.10-f21f85de4b3b9ad4a671fb19a889c16db2ea38b2.tar.gz linux-3.10-f21f85de4b3b9ad4a671fb19a889c16db2ea38b2.tar.bz2 linux-3.10-f21f85de4b3b9ad4a671fb19a889c16db2ea38b2.zip | |
ACPI: ibm-acpi: rename driver to thinkpad-acpi
Rename the ibm-acpi driver to thinkpad-acpi. ThinkPads are not even made
by IBM anymore, so it is high time to rename the driver...
The name thinkpad-acpi was used sometime ago by a thinkpad-specific hotkey
driver by Erik Rigtorp, around the 2.6.8-2.6.10 time frame. The driver
apparently never got merged into mainline (it did make some trips through
-mm). ibm-acpi was merged soon after, making its debut in 2.6.10.
The reuse of the thinkpad-acpi name shouldn't be a problem as far as user
confusion goes, as Erik's thinkpad-acpi apparently didn't get widespread
use in the Linux ThinkPad community and most hits for thinkpad-acpi in
google point to ibm-acpi anyway.
Erik, if you read this, please consider the reuse of the thinkpad-acpi name
as a compliment to your effort to make ThinkPads more useful to all of us.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | Documentation/thinkpad-acpi.txt (renamed from Documentation/ibm-acpi.txt) | 0 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c (renamed from drivers/misc/ibm_acpi.c) | 2 | ||||
| -rw-r--r-- | drivers/misc/thinkpad_acpi.h (renamed from drivers/misc/ibm_acpi.h) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/ibm-acpi.txt b/Documentation/thinkpad-acpi.txt index f409f4bbdc4..f409f4bbdc4 100644 --- a/Documentation/ibm-acpi.txt +++ b/Documentation/thinkpad-acpi.txt diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 848b398482d..ebf4ff2f858 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -12,4 +12,4 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o -obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o +obj-$(CONFIG_ACPI_IBM) += thinkpad_acpi.o diff --git a/drivers/misc/ibm_acpi.c b/drivers/misc/thinkpad_acpi.c index ae03b8f6f7b..2836516ece8 100644 --- a/drivers/misc/ibm_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -79,7 +79,7 @@ * 2004-08-09 0.1 initial release, support for X series */ -#include "ibm_acpi.h" +#include "thinkpad_acpi.h" MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); MODULE_DESCRIPTION(IBM_DESC); diff --git a/drivers/misc/ibm_acpi.h b/drivers/misc/thinkpad_acpi.h index 7ebaaa40e18..7ebaaa40e18 100644 --- a/drivers/misc/ibm_acpi.h +++ b/drivers/misc/thinkpad_acpi.h |