diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-09-10 03:26:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 13:06:30 -0400 |
commit | 338cec3253a6d43d02e5e96abc327197565efcc8 (patch) | |
tree | e56af7e1117f7ec47a4e854476103c22aa9fc1bc /drivers/ide/ide-io.c | |
parent | f9101210e7aa72daf92722d451a2f7e3af5f781f (diff) |
[PATCH] merge some from Rusty's trivial patches
This patch contains the most trivial from Rusty's trivial patches:
- spelling fixes
- remove duplicate includes
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index f174aee659e5..9e9cf1407311 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -560,7 +560,7 @@ ide_startstop_t __ide_abort(ide_drive_t *drive, struct request *rq) | |||
560 | EXPORT_SYMBOL_GPL(__ide_abort); | 560 | EXPORT_SYMBOL_GPL(__ide_abort); |
561 | 561 | ||
562 | /** | 562 | /** |
563 | * ide_abort - abort pending IDE operatins | 563 | * ide_abort - abort pending IDE operations |
564 | * @drive: drive the error occurred on | 564 | * @drive: drive the error occurred on |
565 | * @msg: message to report | 565 | * @msg: message to report |
566 | * | 566 | * |
@@ -623,7 +623,7 @@ static void ide_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, | |||
623 | * @drive: drive the completion interrupt occurred on | 623 | * @drive: drive the completion interrupt occurred on |
624 | * | 624 | * |
625 | * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. | 625 | * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. |
626 | * We do any necessary daya reading and then wait for the drive to | 626 | * We do any necessary data reading and then wait for the drive to |
627 | * go non busy. At that point we may read the error data and complete | 627 | * go non busy. At that point we may read the error data and complete |
628 | * the request | 628 | * the request |
629 | */ | 629 | */ |
@@ -773,7 +773,7 @@ EXPORT_SYMBOL_GPL(ide_init_sg_cmd); | |||
773 | 773 | ||
774 | /** | 774 | /** |
775 | * execute_drive_command - issue special drive command | 775 | * execute_drive_command - issue special drive command |
776 | * @drive: the drive to issue th command on | 776 | * @drive: the drive to issue the command on |
777 | * @rq: the request structure holding the command | 777 | * @rq: the request structure holding the command |
778 | * | 778 | * |
779 | * execute_drive_cmd() issues a special drive command, usually | 779 | * execute_drive_cmd() issues a special drive command, usually |