diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/acpi/acconfig.h | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/acpi/acconfig.h')
| -rw-r--r-- | include/acpi/acconfig.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 2b41e47b7d80..2f6ab189fc6f 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | 64 | ||
| 65 | /* Version string */ | 65 | /* Version string */ |
| 66 | 66 | ||
| 67 | #define ACPI_CA_VERSION 0x20050309 | 67 | #define ACPI_CA_VERSION 0x20050408 |
| 68 | 68 | ||
| 69 | /* | 69 | /* |
| 70 | * OS name, used for the _OS object. The _OS object is essentially obsolete, | 70 | * OS name, used for the _OS object. The _OS object is essentially obsolete, |
| @@ -130,9 +130,8 @@ | |||
| 130 | #define ACPI_MAX_GPE_BLOCKS 2 | 130 | #define ACPI_MAX_GPE_BLOCKS 2 |
| 131 | #define ACPI_GPE_REGISTER_WIDTH 8 | 131 | #define ACPI_GPE_REGISTER_WIDTH 8 |
| 132 | 132 | ||
| 133 | /* | 133 | /* Method info (in WALK_STATE), containing local variables and argumetns */ |
| 134 | * Method info (in WALK_STATE), containing local variables and argumetns | 134 | |
| 135 | */ | ||
| 136 | #define ACPI_METHOD_NUM_LOCALS 8 | 135 | #define ACPI_METHOD_NUM_LOCALS 8 |
| 137 | #define ACPI_METHOD_MAX_LOCAL 7 | 136 | #define ACPI_METHOD_MAX_LOCAL 7 |
| 138 | 137 | ||