diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
| commit | 173cc11a6e10c38ff7d4949b48e8d2eb0aee3e05 (patch) | |
| tree | 44ac9a6fe4e9c51b2c54918aa338df7eda96b0a5 /include/acpi | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
| parent | 88e5071525ad6814be3a8a2792ce9e81a0cca22a (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acoutput.h | 8 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 5c823d5ab78..d814da4b536 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -85,7 +85,8 @@ #define ACPI_LV_INIT 0x00000001 #define ACPI_LV_DEBUG_OBJECT 0x00000002 #define ACPI_LV_INFO 0x00000004 -#define ACPI_LV_ALL_EXCEPTIONS 0x00000007 +#define ACPI_LV_REPAIR 0x00000008 +#define ACPI_LV_ALL_EXCEPTIONS 0x0000000F /* Trace verbosity level 1 [Standard Trace Level] */ @@ -143,6 +144,7 @@ #define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT) #define ACPI_DB_DEBUG_OBJECT ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT) #define ACPI_DB_INFO ACPI_DEBUG_LEVEL (ACPI_LV_INFO) +#define ACPI_DB_REPAIR ACPI_DEBUG_LEVEL (ACPI_LV_REPAIR) #define ACPI_DB_ALL_EXCEPTIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS) /* Trace level -- also used in the global "DebugLevel" */ @@ -174,8 +176,8 @@ /* Defaults for debug_level, debug and normal */ -#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO) -#define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT) +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) +#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) #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES) diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 5e1ad3cd1bb..86e9735a96b 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -47,7 +47,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20091112 +#define ACPI_CA_VERSION 0x20091214 #include "actypes.h" #include "actbl.h" |