diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
| commit | e840dfe334b4791af07aadee1b2cf3c7c7363581 (patch) | |
| tree | b0f8336f578cb6d3e39399f6714b8ec811536225 /include/acpi | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| parent | a1f37788a6d8c037e7d92fe4a0fe9ec0d713b21e (diff) | |
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into tboot
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acexcep.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 5b6c391efc8e..fa0d22ce089e 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #define ACPI_SUCCESS(a) (!(a)) | 57 | #define ACPI_SUCCESS(a) (!(a)) |
| 58 | #define ACPI_FAILURE(a) (a) | 58 | #define ACPI_FAILURE(a) (a) |
| 59 | 59 | ||
| 60 | #define ACPI_SKIP(a) (a == AE_CTRL_SKIP) | ||
| 60 | #define AE_OK (acpi_status) 0x0000 | 61 | #define AE_OK (acpi_status) 0x0000 |
| 61 | 62 | ||
| 62 | /* | 63 | /* |