diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 14:45:36 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 14:45:36 (GMT) |
commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
tree | d3e3f2067dc423721d698d154e15213aa5b0132d /include | |
parent | 0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (diff) | |
parent | 720fc22a7af79d91ec460c80efa92c65c12d105e (diff) | |
download | linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: Fix IDE taskfile with cfq scheduler
ide: Must hold queue lock when requeueing
ide: Requeue request after DMA timeout
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 97e6ab4..3239d1c 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1169,6 +1169,7 @@ extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); extern void ide_timer_expiry(unsigned long); extern irqreturn_t ide_intr(int irq, void *dev_id); extern void do_ide_request(struct request_queue *); +extern void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq); void ide_init_disk(struct gendisk *, ide_drive_t *); |