diff options
author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/acpi/acexcep.h | |
parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acexcep.h')
-rw-r--r-- | include/acpi/acexcep.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 53f8b50fac1a..60d737b2d70f 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h | |||
@@ -48,7 +48,6 @@ | |||
48 | /* | 48 | /* |
49 | * Exceptions returned by external ACPI interfaces | 49 | * Exceptions returned by external ACPI interfaces |
50 | */ | 50 | */ |
51 | |||
52 | #define AE_CODE_ENVIRONMENTAL 0x0000 | 51 | #define AE_CODE_ENVIRONMENTAL 0x0000 |
53 | #define AE_CODE_PROGRAMMER 0x1000 | 52 | #define AE_CODE_PROGRAMMER 0x1000 |
54 | #define AE_CODE_ACPI_TABLES 0x2000 | 53 | #define AE_CODE_ACPI_TABLES 0x2000 |
@@ -99,6 +98,7 @@ | |||
99 | 98 | ||
100 | #define AE_CODE_ENV_MAX 0x001E | 99 | #define AE_CODE_ENV_MAX 0x001E |
101 | 100 | ||
101 | |||
102 | /* | 102 | /* |
103 | * Programmer exceptions | 103 | * Programmer exceptions |
104 | */ | 104 | */ |
@@ -168,6 +168,7 @@ | |||
168 | 168 | ||
169 | #define AE_CODE_AML_MAX 0x0021 | 169 | #define AE_CODE_AML_MAX 0x0021 |
170 | 170 | ||
171 | |||
171 | /* | 172 | /* |
172 | * Internal exceptions used for control | 173 | * Internal exceptions used for control |
173 | */ | 174 | */ |
@@ -188,6 +189,7 @@ | |||
188 | 189 | ||
189 | #ifdef DEFINE_ACPI_GLOBALS | 190 | #ifdef DEFINE_ACPI_GLOBALS |
190 | 191 | ||
192 | |||
191 | /* | 193 | /* |
192 | * String versions of the exception codes above | 194 | * String versions of the exception codes above |
193 | * These strings must match the corresponding defines exactly | 195 | * These strings must match the corresponding defines exactly |
@@ -304,5 +306,4 @@ char const *acpi_gbl_exception_names_ctrl[] = | |||
304 | 306 | ||
305 | #endif /* ACPI GLOBALS */ | 307 | #endif /* ACPI GLOBALS */ |
306 | 308 | ||
307 | |||
308 | #endif /* __ACEXCEP_H__ */ | 309 | #endif /* __ACEXCEP_H__ */ |