diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-23 01:52:00 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-23 01:52:00 +0300 |
commit | c47a75a45fa3a9d98b61f7e31983ffab2c44404f (patch) | |
tree | 4a2a469886fd401648334312018fade9ae98e063 /drivers/acpi/utilities/utglobal.c | |
parent | 0099f77e0a224cc461d0d2930ef0fdb32c61ba64 (diff) | |
parent | abe1dfab60e1839d115930286cb421f5a5b193f3 (diff) | |
download | linux-c47a75a45fa3a9d98b61f7e31983ffab2c44404f.tar.xz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: don't cond_resched() when irqs_disabled()
ACPI: fix 2.6.28 acpi.debug_level regression
Diffstat (limited to 'drivers/acpi/utilities/utglobal.c')
-rw-r--r-- | drivers/acpi/utilities/utglobal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index 670551b95e56..17ed5ac840f7 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c @@ -64,7 +64,7 @@ u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT; /* Debug switch - layer (component) mask */ -u32 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT | ACPI_ALL_DRIVERS; +u32 acpi_dbg_layer = 0; u32 acpi_gbl_nesting_level = 0; /* Debugger globals */ |