Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[linux-2.6-block.git] / drivers / ata / libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 34406f7fdd7a1274da79601489a30e6df774290c..c19734d96d7e6a029a1adf9667ce5a897708b58c 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1524,7 +1524,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
  *     @dev: Device to which the command is sent
  *     @tf: Taskfile registers for the command and the result
  *     @cdb: CDB for packet command
- *     @dma_dir: Data tranfer direction of the command
+ *     @dma_dir: Data transfer direction of the command
  *     @sgl: sg list for the data buffer of the command
  *     @n_elem: Number of sg entries
  *     @timeout: Timeout in msecs (0 for default)
@@ -1712,7 +1712,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
  *     @dev: Device to which the command is sent
  *     @tf: Taskfile registers for the command and the result
  *     @cdb: CDB for packet command
- *     @dma_dir: Data tranfer direction of the command
+ *     @dma_dir: Data transfer direction of the command
  *     @buf: Data buffer of the command
  *     @buflen: Length of data buffer
  *     @timeout: Timeout in msecs (0 for default)