diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-30 20:09:11 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-30 20:09:11 +0300 |
| commit | 782492a7a4807317319a0b1832594d07ba79747d (patch) | |
| tree | 882d302ed4ff703501ab0c0ab773eaf4cebf10cd /drivers | |
| parent | 8e377a1c7e2465831b39dbe24ec04c0a8b36fc76 (diff) | |
| parent | aa9aaa4d61c0048d3faad056893cd7860bbc084c (diff) | |
| download | linux-782492a7a4807317319a0b1832594d07ba79747d.tar.xz | |
Merge tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"This corrects a previous attempt to make Linux use its own set of ACPI
debug flags different from the upstream ACPICA's default (Erik
Schmauss)"
* tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: use different default debug value than ACPICA
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/bus.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 6ecbbabf1233..eec263c9019e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1043,9 +1043,6 @@ void __init acpi_early_init(void) acpi_permanent_mmap = true; - /* Initialize debug output. Linux does not use ACPICA defaults */ - acpi_dbg_level = ACPI_LV_INFO | ACPI_LV_REPAIR; - #ifdef CONFIG_X86 /* * If the machine falls into the DMI check table, |