Add patches accepted for 2.6.29-rc2
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.29-rc2 / 0014-ACPI-thinkpad-acpi-bump-up-version-to-0.22.patch
blob8f1378a9f6c6b6ada363f7b833d886fccd8a6532
1 From aa2fbcec07b0d594808bc3058692395d24eba66e Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Sun, 11 Jan 2009 03:01:10 -0200
4 Subject: ACPI: thinkpad-acpi: bump up version to 0.22
6 It is about time to bump up the version.
8 Features added since 0.21: fan suspend/resume support, preserve radio
9 state across power off (for some radio types), built-in UWB radio
10 rfkill support and thermal alarm events support.
12 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
13 Signed-off-by: Len Brown <len.brown@intel.com>
14 ---
15 Documentation/laptops/thinkpad-acpi.txt | 6 +++---
16 drivers/platform/x86/thinkpad_acpi.c | 2 +-
17 2 files changed, 4 insertions(+), 4 deletions(-)
19 diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
20 index 91c0001..41bc99f 100644
21 --- a/Documentation/laptops/thinkpad-acpi.txt
22 +++ b/Documentation/laptops/thinkpad-acpi.txt
23 @@ -1,7 +1,7 @@
24 ThinkPad ACPI Extras Driver
26 - Version 0.21
27 - May 29th, 2008
28 + Version 0.22
29 + November 23rd, 2008
31 Borislav Deianov <borislav@users.sf.net>
32 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
33 @@ -17,7 +17,7 @@ This driver used to be named ibm-acpi until kernel 2.6.21 and release
34 0.13-20070314. It used to be in the drivers/acpi tree, but it was
35 moved to the drivers/misc tree and renamed to thinkpad-acpi for kernel
36 2.6.22, and release 0.14. It was moved to drivers/platform/x86 for
37 -kernel 2.6.29.
38 +kernel 2.6.29 and release 0.22.
40 The driver is named "thinkpad-acpi". In some places, like module
41 names, "thinkpad_acpi" is used because of userspace issues.
42 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
43 index 886a430..bcbc051 100644
44 --- a/drivers/platform/x86/thinkpad_acpi.c
45 +++ b/drivers/platform/x86/thinkpad_acpi.c
46 @@ -21,7 +21,7 @@
47 * 02110-1301, USA.
50 -#define TPACPI_VERSION "0.21"
51 +#define TPACPI_VERSION "0.22"
52 #define TPACPI_SYSFS_VERSION 0x020200
55 --
56 1.5.6.5