diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 17:52:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 17:52:00 -0500 |
| commit | c47a75a45fa3a9d98b61f7e31983ffab2c44404f (patch) | |
| tree | 4a2a469886fd401648334312018fade9ae98e063 /drivers/acpi/bus.c | |
| parent | 0099f77e0a224cc461d0d2930ef0fdb32c61ba64 (diff) | |
| parent | abe1dfab60e1839d115930286cb421f5a5b193f3 (diff) | |
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/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 7edf6d913c13..765fd1c56cd6 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -688,14 +688,6 @@ void __init acpi_early_init(void) | |||
| 688 | if (acpi_disabled) | 688 | if (acpi_disabled) |
| 689 | return; | 689 | return; |
| 690 | 690 | ||
| 691 | /* | ||
| 692 | * ACPI CA initializes acpi_dbg_level to non-zero, which means | ||
| 693 | * we get debug output merely by turning on CONFIG_ACPI_DEBUG. | ||
| 694 | * Turn it off so we don't get output unless the user specifies | ||
| 695 | * acpi.debug_level. | ||
| 696 | */ | ||
| 697 | acpi_dbg_level = 0; | ||
| 698 | |||
| 699 | printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION); | 691 | printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION); |
| 700 | 692 | ||
| 701 | /* enable workarounds, unless strict ACPI spec. compliance */ | 693 | /* enable workarounds, unless strict ACPI spec. compliance */ |