Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / drivers / s390 / char / tape.h

diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index 3b52f5c1dbefc2d1b388d74c8d46842a72ee28a3..d0d565a05dfebf63a5ddea6ed93b37949465c431 100644 (file)
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -188,7 +188,7 @@ struct tape_blk_data
 {
        struct tape_device *    device;
        /* Block device request queue. */
-       request_queue_t *       request_queue;
+       struct request_queue *  request_queue;
        spinlock_t              request_queue_lock;
 
        /* Task to move entries from block request to CCS request queue. */
@@ -231,6 +231,9 @@ struct tape_device {
        /* Request queue. */
        struct list_head                req_queue;
 
+       /* Request wait queue. */
+       wait_queue_head_t               wait_queue;
+
        /* Each tape device has (currently) two minor numbers. */
        int                             first_minor;