diff options
Diffstat (limited to 'drivers/s390/char')
-rw-r--r-- | drivers/s390/char/tape.h | 2 | ||||
-rw-r--r-- | drivers/s390/char/tape_block.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h index 3b52f5c1dbef..dddf8d62c153 100644 --- a/drivers/s390/char/tape.h +++ b/drivers/s390/char/tape.h | |||
@@ -188,7 +188,7 @@ struct tape_blk_data | |||
188 | { | 188 | { |
189 | struct tape_device * device; | 189 | struct tape_device * device; |
190 | /* Block device request queue. */ | 190 | /* Block device request queue. */ |
191 | request_queue_t * request_queue; | 191 | struct request_queue * request_queue; |
192 | spinlock_t request_queue_lock; | 192 | spinlock_t request_queue_lock; |
193 | 193 | ||
194 | /* Task to move entries from block request to CCS request queue. */ | 194 | /* Task to move entries from block request to CCS request queue. */ |
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index dd0ecaed592e..eeb92e2ed0cc 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c | |||
@@ -147,7 +147,7 @@ static void | |||
147 | tapeblock_requeue(struct work_struct *work) { | 147 | tapeblock_requeue(struct work_struct *work) { |
148 | struct tape_blk_data * blkdat; | 148 | struct tape_blk_data * blkdat; |
149 | struct tape_device * device; | 149 | struct tape_device * device; |
150 | request_queue_t * queue; | 150 | struct request_queue * queue; |
151 | int nr_queued; | 151 | int nr_queued; |
152 | struct request * req; | 152 | struct request * req; |
153 | struct list_head * l; | 153 | struct list_head * l; |
@@ -194,7 +194,7 @@ tapeblock_requeue(struct work_struct *work) { | |||
194 | * Tape request queue function. Called from ll_rw_blk.c | 194 | * Tape request queue function. Called from ll_rw_blk.c |
195 | */ | 195 | */ |
196 | static void | 196 | static void |
197 | tapeblock_request_fn(request_queue_t *queue) | 197 | tapeblock_request_fn(struct request_queue *queue) |
198 | { | 198 | { |
199 | struct tape_device *device; | 199 | struct tape_device *device; |
200 | 200 | ||