diff --git a/[refs] b/[refs]
index 3dc5f485410b..ea4c247fd506 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7f123f378743d739377871c0cbfbaf28c7d25a
+refs/heads/master: ea312552e94883efc42cfa4651bcf964f3110564
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
index 85d38940a6c9..fdc6618c1f61 100644
--- a/trunk/drivers/scsi/sg.c
+++ b/trunk/drivers/scsi/sg.c
@@ -114,7 +114,7 @@ static struct class_interface sg_interface = {
 
 typedef struct sg_scatter_hold { /* holding area for scsi scatter gather info */
 	unsigned short k_use_sg; /* Count of kernel scatter-gather pieces */
-	unsigned short sglist_len; /* size of malloc'd scatter-gather list ++ */
+	unsigned sglist_len; /* size of malloc'd scatter-gather list ++ */
 	unsigned bufflen;	/* Size of (aggregate) data buffer */
 	unsigned b_malloc_len;	/* actual len malloc'ed in buffer */
 	struct scatterlist *buffer;/* scatter list */