diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/acpi/acstruct.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | ||