aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
commitda206c9e68cb93fcab43592d46276c02889c1250 (patch)
tree21264cc26fa0322d668b398808f10bd93558d25f /drivers/ide
parent916d15445f4ad2a9018e5451760734f36083be77 (diff)
parent2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-disk.c2
-rw-r--r--drivers/ide/ide-io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index a5017de72da5..f033d732f387 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -37,7 +37,7 @@
37 * Version 1.15 convert all calls to ide_raw_taskfile 37 * Version 1.15 convert all calls to ide_raw_taskfile
38 * since args will return register content. 38 * since args will return register content.
39 * Version 1.16 added suspend-resume-checkpower 39 * Version 1.16 added suspend-resume-checkpower
40 * Version 1.17 do flush on standy, do flush on ATA < ATA6 40 * Version 1.17 do flush on standby, do flush on ATA < ATA6
41 * fix wcache setup. 41 * fix wcache setup.
42 */ 42 */
43 43
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index d2428cef1598..935cb2583770 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1665,7 +1665,7 @@ irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs)
1665 * Initialize a request before we fill it in and send it down to 1665 * Initialize a request before we fill it in and send it down to
1666 * ide_do_drive_cmd. Commands must be set up by this function. Right 1666 * ide_do_drive_cmd. Commands must be set up by this function. Right
1667 * now it doesn't do a lot, but if that changes abusers will have a 1667 * now it doesn't do a lot, but if that changes abusers will have a
1668 * nasty suprise. 1668 * nasty surprise.
1669 */ 1669 */
1670 1670
1671void ide_init_drive_cmd (struct request *rq) 1671void ide_init_drive_cmd (struct request *rq)