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/acstruct.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/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 | ||