Add patches accepted for 2.6.30-rc1
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.30-rc1 / 0007-thinkpad-acpi-add-missing-log-levels.patch
blobaf07bb2048488e86895d1c17d19a8c8cfce31749
1 From 7ff8d62f7f055aaffbeb493863136c1b876bbe2e Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Sat, 4 Apr 2009 04:25:46 +0000
4 Subject: thinkpad-acpi: add missing log levels
6 Add missing log levels in a standalone commit, to avoid dependencies in
7 future unrelated changes, just because they wanted to use one of the
8 missing log levels.
10 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
11 Signed-off-by: Len Brown <len.brown@intel.com>
12 ---
13 drivers/platform/x86/thinkpad_acpi.c | 19 +++++++++++--------
14 1 files changed, 11 insertions(+), 8 deletions(-)
16 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
17 index 3367df9..6331b88 100644
18 --- a/drivers/platform/x86/thinkpad_acpi.c
19 +++ b/drivers/platform/x86/thinkpad_acpi.c
20 @@ -172,15 +172,18 @@ enum {
21 TPACPI_RFK_UWB_SW_ID,
24 -/* Debugging */
25 +/* printk headers */
26 #define TPACPI_LOG TPACPI_FILE ": "
27 -#define TPACPI_ALERT KERN_ALERT TPACPI_LOG
28 -#define TPACPI_CRIT KERN_CRIT TPACPI_LOG
29 -#define TPACPI_ERR KERN_ERR TPACPI_LOG
30 -#define TPACPI_NOTICE KERN_NOTICE TPACPI_LOG
31 -#define TPACPI_INFO KERN_INFO TPACPI_LOG
32 -#define TPACPI_DEBUG KERN_DEBUG TPACPI_LOG
34 +#define TPACPI_EMERG KERN_EMERG TPACPI_LOG
35 +#define TPACPI_ALERT KERN_ALERT TPACPI_LOG
36 +#define TPACPI_CRIT KERN_CRIT TPACPI_LOG
37 +#define TPACPI_ERR KERN_ERR TPACPI_LOG
38 +#define TPACPI_WARN KERN_WARNING TPACPI_LOG
39 +#define TPACPI_NOTICE KERN_NOTICE TPACPI_LOG
40 +#define TPACPI_INFO KERN_INFO TPACPI_LOG
41 +#define TPACPI_DEBUG KERN_DEBUG TPACPI_LOG
43 +/* Debugging printk groups */
44 #define TPACPI_DBG_ALL 0xffff
45 #define TPACPI_DBG_INIT 0x0001
46 #define TPACPI_DBG_EXIT 0x0002
47 --
48 1.6.2.1