diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /drivers/ata/libata-acpi.c | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 6273d98d00eb..ac176da1f94e 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -748,9 +748,9 @@ static int ata_acpi_run_tf(struct ata_device *dev, | |||
| 748 | /** | 748 | /** |
| 749 | * ata_acpi_exec_tfs - get then write drive taskfile settings | 749 | * ata_acpi_exec_tfs - get then write drive taskfile settings |
| 750 | * @dev: target ATA device | 750 | * @dev: target ATA device |
| 751 | * @nr_executed: out paramter for the number of executed commands | 751 | * @nr_executed: out parameter for the number of executed commands |
| 752 | * | 752 | * |
| 753 | * Evaluate _GTF and excute returned taskfiles. | 753 | * Evaluate _GTF and execute returned taskfiles. |
| 754 | * | 754 | * |
| 755 | * LOCKING: | 755 | * LOCKING: |
| 756 | * EH context. | 756 | * EH context. |