diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
| commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
| tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /include/acpi/acoutput.h | |
| parent | cd9063757a227cf31ebf5391ccda2bf583b0806e (diff) | |
| parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'include/acpi/acoutput.h')
| -rw-r--r-- | include/acpi/acoutput.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 30b1ae53689f..c50542dc71e0 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -150,7 +150,10 @@ /* Defaults for debug_level, debug and normal */ +#ifndef ACPI_DEBUG_DEFAULT #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR) +#endif + #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) |