diff options
| author | Len Brown <len.brown@intel.com> | 2004-02-05 12:21:02 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-02-05 12:21:02 -0500 |
| commit | 151fa98b00778e62ebb74f8dd64a0f0cff9997ac (patch) | |
| tree | b50419187097dcb135c2c1f6bfa4e1429264fc36 /include/linux/blkdev.h | |
| parent | cbd884c9feafad7e29214eeaee9a36e48053d31a (diff) | |
| parent | 12a981f8fd62fb34823626844a5c76d6614055fe (diff) | |
Merge intel.com:/home/lenb/bk/linux-2.6.3
into intel.com:/home/lenb/src/linux-acpi-test-2.6.3
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d0ba766eca75..e4aa5cfac38c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -508,7 +508,7 @@ extern int blk_remove_plug(request_queue_t *); extern void blk_recount_segments(request_queue_t *, struct bio *); extern inline int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *); extern inline int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *); -extern int scsi_cmd_ioctl(struct block_device *, unsigned int, unsigned long); +extern int scsi_cmd_ioctl(struct gendisk *, unsigned int, unsigned long); extern void blk_start_queue(request_queue_t *q); extern void blk_stop_queue(request_queue_t *q); extern void __blk_stop_queue(request_queue_t *q); |