From f21f85de4b3b9ad4a671fb19a889c16db2ea38b2 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Thu, 29 Mar 2007 01:58:40 -0300 Subject: [PATCH] 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 Signed-off-by: Len Brown --- Documentation/{ibm-acpi.txt => thinkpad-acpi.txt} | 0 drivers/misc/Makefile | 2 +- drivers/misc/{ibm_acpi.c => thinkpad_acpi.c} | 2 +- drivers/misc/{ibm_acpi.h => thinkpad_acpi.h} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/{ibm-acpi.txt => thinkpad-acpi.txt} (100%) rename drivers/misc/{ibm_acpi.c => thinkpad_acpi.c} (99%) rename drivers/misc/{ibm_acpi.h => thinkpad_acpi.h} (100%) diff --git a/Documentation/ibm-acpi.txt b/Documentation/thinkpad-acpi.txt similarity index 100% rename from Documentation/ibm-acpi.txt rename to Documentation/thinkpad-acpi.txt diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 848b398482d9..ebf4ff2f858e 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 similarity index 99% rename from drivers/misc/ibm_acpi.c rename to drivers/misc/thinkpad_acpi.c index ae03b8f6f7be..2836516ece86 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 similarity index 100% rename from drivers/misc/ibm_acpi.h rename to drivers/misc/thinkpad_acpi.h