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 /drivers/acpi/dispatcher/dsmethod.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/acpi/dispatcher/dsmethod.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsmethod.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c index 9f0456cb9bb5..9fc3f4c033eb 100644 --- a/drivers/acpi/dispatcher/dsmethod.c +++ b/drivers/acpi/dispatcher/dsmethod.c | |||
| @@ -153,12 +153,11 @@ acpi_ds_parse_method ( | |||
| 153 | /* | 153 | /* |
| 154 | * Parse the method, first pass | 154 | * Parse the method, first pass |
| 155 | * | 155 | * |
| 156 | * The first pass load is where newly declared named objects are | 156 | * The first pass load is where newly declared named objects are added into |
| 157 | * added into the namespace. Actual evaluation of | 157 | * the namespace. Actual evaluation of the named objects (what would be |
| 158 | * the named objects (what would be called a "second | 158 | * called a "second pass") happens during the actual execution of the |
| 159 | * pass") happens during the actual execution of the | 159 | * method so that operands to the named objects can take on dynamic |
| 160 | * method so that operands to the named objects can | 160 | * run-time values. |
| 161 | * take on dynamic run-time values. | ||
| 162 | */ | 161 | */ |
| 163 | status = acpi_ps_parse_aml (walk_state); | 162 | status = acpi_ps_parse_aml (walk_state); |
| 164 | if (ACPI_FAILURE (status)) { | 163 | if (ACPI_FAILURE (status)) { |