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/acstruct.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/acstruct.h')
-rw-r--r-- | include/acpi/acstruct.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h index c97843f6bcbc..e6b9e36a2eda 100644 --- a/include/acpi/acstruct.h +++ b/include/acpi/acstruct.h | |||
@@ -56,7 +56,6 @@ | |||
56 | * Walk state - current state of a parse tree walk. Used for both a leisurely stroll through | 56 | * Walk state - current state of a parse tree walk. Used for both a leisurely stroll through |
57 | * the tree (for whatever reason), and for control method execution. | 57 | * the tree (for whatever reason), and for control method execution. |
58 | */ | 58 | */ |
59 | |||
60 | #define ACPI_NEXT_OP_DOWNWARD 1 | 59 | #define ACPI_NEXT_OP_DOWNWARD 1 |
61 | #define ACPI_NEXT_OP_UPWARD 2 | 60 | #define ACPI_NEXT_OP_UPWARD 2 |
62 | 61 | ||