diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/acpi/acoutput.h | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.gz kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.bz2 | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/acpi/acoutput.h')
| -rw-r--r-- | include/acpi/acoutput.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index d772668..5e95226 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -206,6 +206,7 @@ #define ACPI_WARNING(plist) acpi_warning plist #define ACPI_EXCEPTION(plist) acpi_exception plist #define ACPI_ERROR(plist) acpi_error plist +#define ACPI_DEBUG_OBJECT(obj,l,i) acpi_ex_do_debug_object(obj,l,i) #else @@ -215,6 +216,7 @@ #define ACPI_WARNING(plist) #define ACPI_EXCEPTION(plist) #define ACPI_ERROR(plist) +#define ACPI_DEBUG_OBJECT(obj,l,i) #endif /* ACPI_NO_ERROR_MESSAGES */ |