summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@redhat.com>2003-06-05 17:28:45 -0400
committerJeff Garzik <jgarzik@redhat.com>2003-06-05 17:28:45 -0400
commitcb4acf11b7dea9799986130b6955d3dc5984956d (patch)
tree28166a2a31ce4b2f36f527a318b46c718f926c57 /include/linux/blkdev.h
parent7107a09c5b02923d43a80ad487f4ebedbb2b07a6 (diff)
parent5c9e7fc05ce05d0f035f715542322e6ee111273a (diff)
Merge redhat.com:/garz/repo/linus-2.5
into redhat.com:/garz/repo/net-drivers-2.5
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 03691501d68f..fd211093a374 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -431,7 +431,6 @@ extern void blk_queue_max_hw_segments(request_queue_t *, unsigned short);
extern void blk_queue_max_segment_size(request_queue_t *, unsigned int);
extern void blk_queue_hardsect_size(request_queue_t *, unsigned short);
extern void blk_queue_segment_boundary(request_queue_t *, unsigned long);
-extern void blk_queue_assign_lock(request_queue_t *, spinlock_t *);
extern void blk_queue_prep_rq(request_queue_t *, prep_rq_fn *pfn);
extern void blk_queue_merge_bvec(request_queue_t *, merge_bvec_fn *);
extern void blk_queue_dma_alignment(request_queue_t *, int);