diff --git a/[refs] b/[refs]
index e04f4be98a43..52ebbc61cb01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a02488ed73488f316aa00eb973407f4229c6c2bf
+refs/heads/master: b29f841378460c37e99a2398d0015d9bd7901a09
diff --git a/trunk/include/scsi/scsi_device.h b/trunk/include/scsi/scsi_device.h
index a37a8148a310..2a1c1419994d 100644
--- a/trunk/include/scsi/scsi_device.h
+++ b/trunk/include/scsi/scsi_device.h
@@ -159,8 +159,6 @@ struct scsi_device {
 	atomic_t iodone_cnt;
 	atomic_t ioerr_cnt;
 
-	int timeout;
-
 	struct device		sdev_gendev,
 				sdev_dev;