diff --git a/[refs] b/[refs]
index e06b65859d52..27a3856deca9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afc071e6281e4f2af4748b5ddc594334726a37cf
+refs/heads/master: 4a531e8c79fe459e922347461ccc0f0c13de20d5
diff --git a/trunk/include/scsi/scsi.h b/trunk/include/scsi/scsi.h
index 8a3f0bd0d45a..5c0e9791441c 100644
--- a/trunk/include/scsi/scsi.h
+++ b/trunk/include/scsi/scsi.h
@@ -433,7 +433,7 @@ struct scsi_lun {
 #define SCSI_IOCTL_GET_PCI		0x5387
 
 /* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
-static inline u32 scsi_to_u32(u8 *ptr)
+static inline __u32 scsi_to_u32(__u8 *ptr)
 {
 	return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
 }