diff --git a/[refs] b/[refs]
index ce2788e4f4d2..1f2aa8bb1a0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ac63cf5c05f956f52ab418a07f77d12328f3b5f
+refs/heads/master: edf69c58c74eeeb48f62f267ce41f7827cb4dd06
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index 50dbe14db37b..fe4c20259bca 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -1524,7 +1524,6 @@ static int setup_buffering(struct scsi_tape *STp, const char __user *buf,
 		else
 			STbp->do_dio = 0;  /* fall back to buffering with any error */
 		STbp->sg_segs = STbp->do_dio;
-		STbp->frp_sg_current = 0;
 		DEB(
 		     if (STbp->do_dio) {
 			STp->nbr_dio++;
@@ -3844,7 +3843,6 @@ static void normalize_buffer(struct st_buffer * STbuffer)
 		STbuffer->buffer_size -= (PAGE_SIZE << order);
 	}
 	STbuffer->frp_segs = 0;
-	STbuffer->frp_sg_current = 0;
 	STbuffer->sg_segs = 0;
 	STbuffer->map_data.page_order = 0;
 	STbuffer->map_data.offset = 0;
diff --git a/trunk/drivers/scsi/st.h b/trunk/drivers/scsi/st.h
index e682f8045034..544dc6b1f548 100644
--- a/trunk/drivers/scsi/st.h
+++ b/trunk/drivers/scsi/st.h
@@ -52,7 +52,6 @@ struct st_buffer {
 	unsigned short use_sg;	/* zero or max number of s/g segments for this adapter */
 	unsigned short sg_segs;		/* number of segments in s/g list */
 	unsigned short frp_segs;	/* number of buffer segments */
-	unsigned int frp_sg_current;	/* driver buffer length currently in s/g list */
 };
 
 /* The tape mode definition */