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

[mv-sheeva.git] / drivers / scsi / arm / acornscsi.h

diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 2142290f84046b42ed89b2ef57774ff7a4ea4151..d11424b89f4237627bbf88c216c25fad2559f32f 100644 (file)
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -277,8 +277,8 @@ struct status_entry {
 typedef struct acornscsi_hostdata {
     /* miscellaneous */
     struct Scsi_Host   *host;                  /* host                                 */
-    Scsi_Cmnd          *SCpnt;                 /* currently processing command         */
-    Scsi_Cmnd          *origSCpnt;             /* original connecting command          */
+    struct scsi_cmnd   *SCpnt;                 /* currently processing command         */
+    struct scsi_cmnd   *origSCpnt;             /* original connecting command          */
 
     /* driver information */
     struct {