diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/acpi/acpica/exstore.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/acpi/acpica/exstore.c')
| -rw-r--r-- | drivers/acpi/acpica/exstore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c index 7c6d7e53e41e..e35e9b4f6a4e 100644 --- a/drivers/acpi/acpica/exstore.c +++ b/drivers/acpi/acpica/exstore.c | |||
| @@ -275,7 +275,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, | |||
| 275 | * | 275 | * |
| 276 | * PARAMETERS: *source_desc - Value to be stored | 276 | * PARAMETERS: *source_desc - Value to be stored |
| 277 | * *dest_desc - Where to store it. Must be an NS node | 277 | * *dest_desc - Where to store it. Must be an NS node |
| 278 | * or an union acpi_operand_object of type | 278 | * or a union acpi_operand_object of type |
| 279 | * Reference; | 279 | * Reference; |
| 280 | * walk_state - Current walk state | 280 | * walk_state - Current walk state |
| 281 | * | 281 | * |