Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[karo-tx-linux.git] / drivers / scsi / qlogicpti.h

diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index ef6da2df584ba29fbfddcbb19e105d0fe7b1a319..9c053bbaa87700b375539138b96648bda15366be 100644 (file)
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -342,7 +342,7 @@ struct qlogicpti {
        u_int                     req_in_ptr;           /* index of next request slot */
        u_int                     res_out_ptr;          /* index of next result slot  */
        long                      send_marker;          /* must we send a marker?     */
-       struct sbus_dev          *sdev;
+       struct of_device         *op;
        unsigned long             __pad;
 
        int                       cmd_count[MAX_TARGETS];