Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index bb4ff537729deb53fbcb629b7e47278643fd406a..dddf8d62c1536cc3d8bebe8e65514f11318c0e8f 100644 (file)
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -103,6 +103,7 @@ enum tape_op {
        TO_CRYPT_OFF,   /* Disable encrpytion */
        TO_KEKL_SET,    /* Set KEK label */
        TO_KEKL_QUERY,  /* Query KEK label */
+       TO_RDC,         /* Read device characteristics */
        TO_SIZE,        /* #entries in tape_op_t */
 };
 
@@ -187,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. */