From fccbcff5612968546775f48140483f6f57ae3fab Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Fri, 20 Oct 2006 09:08:18 +0900
Subject: [PATCH] --- yaml --- r: 40343 b: refs/heads/master c:
 4a531e8c79fe459e922347461ccc0f0c13de20d5 h: refs/heads/master i:   40341:
 10b1bc67acd49d767276263bf7c3821a3e7538a4   40339:
 b7d31747888e608a90586498b9fcdfdbbfddc8fa   40335:
 27c2eafdb263be7ab62b0b6413458095ae6de661 v: v3

---
 [refs]                    | 2 +-
 trunk/include/scsi/scsi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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];
 }