Add patches accepted for 2.6.22-rc1 (not released yet)
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.22-rc1 / 0008-ACPI-ibm-acpi-rename-driver-to-thinkpad-acpi.patch
blobb61d4fefb920bc67deb8a4bd9765e19097f60829
1 From f21f85de4b3b9ad4a671fb19a889c16db2ea38b2 Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Thu, 29 Mar 2007 01:58:40 -0300
4 Subject: ACPI: ibm-acpi: rename driver to thinkpad-acpi
6 Rename the ibm-acpi driver to thinkpad-acpi. ThinkPads are not even made
7 by IBM anymore, so it is high time to rename the driver...
9 The name thinkpad-acpi was used sometime ago by a thinkpad-specific hotkey
10 driver by Erik Rigtorp, around the 2.6.8-2.6.10 time frame. The driver
11 apparently never got merged into mainline (it did make some trips through
12 -mm). ibm-acpi was merged soon after, making its debut in 2.6.10.
14 The reuse of the thinkpad-acpi name shouldn't be a problem as far as user
15 confusion goes, as Erik's thinkpad-acpi apparently didn't get widespread
16 use in the Linux ThinkPad community and most hits for thinkpad-acpi in
17 google point to ibm-acpi anyway.
19 Erik, if you read this, please consider the reuse of the thinkpad-acpi name
20 as a compliment to your effort to make ThinkPads more useful to all of us.
22 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
23 Signed-off-by: Len Brown <len.brown@intel.com>
24 ---
25 Documentation/{ibm-acpi.txt => thinkpad-acpi.txt} | 0
26 drivers/misc/Makefile | 2 +-
27 drivers/misc/{ibm_acpi.c => thinkpad_acpi.c} | 2 +-
28 drivers/misc/{ibm_acpi.h => thinkpad_acpi.h} | 0
29 4 files changed, 2 insertions(+), 2 deletions(-)
30 rename Documentation/{ibm-acpi.txt => thinkpad-acpi.txt} (100%)
31 rename drivers/misc/{ibm_acpi.c => thinkpad_acpi.c} (100%)
32 rename drivers/misc/{ibm_acpi.h => thinkpad_acpi.h} (100%)
34 diff --git a/Documentation/ibm-acpi.txt b/Documentation/thinkpad-acpi.txt
35 similarity index 100%
36 rename from Documentation/ibm-acpi.txt
37 rename to Documentation/thinkpad-acpi.txt
38 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
39 index 848b398..ebf4ff2 100644
40 --- a/drivers/misc/Makefile
41 +++ b/drivers/misc/Makefile
42 @@ -12,4 +12,4 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o
43 obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
44 obj-$(CONFIG_SGI_IOC4) += ioc4.o
45 obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
46 -obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o
47 +obj-$(CONFIG_ACPI_IBM) += thinkpad_acpi.o
48 diff --git a/drivers/misc/ibm_acpi.c b/drivers/misc/thinkpad_acpi.c
49 similarity index 100%
50 rename from drivers/misc/ibm_acpi.c
51 rename to drivers/misc/thinkpad_acpi.c
52 index ae03b8f..2836516 100644
53 --- a/drivers/misc/ibm_acpi.c
54 +++ b/drivers/misc/thinkpad_acpi.c
55 @@ -79,7 +79,7 @@
56 * 2004-08-09 0.1 initial release, support for X series
59 -#include "ibm_acpi.h"
60 +#include "thinkpad_acpi.h"
62 MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
63 MODULE_DESCRIPTION(IBM_DESC);
64 diff --git a/drivers/misc/ibm_acpi.h b/drivers/misc/thinkpad_acpi.h
65 similarity index 100%
66 rename from drivers/misc/ibm_acpi.h
67 rename to drivers/misc/thinkpad_acpi.h
68 --
69 1.5.1