diff --git a/[refs] b/[refs]
index 6e8e6b7a47d5..4ccbc1c862cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4713741955736210511a5959bf13e92f8598dacd
+refs/heads/master: cad359c68455d6870d053184bbb0ae208e207eef
diff --git a/trunk/drivers/scsi/NCR53C9x.c b/trunk/drivers/scsi/NCR53C9x.c
index 3c86655a5f33..74b93564a258 100644
--- a/trunk/drivers/scsi/NCR53C9x.c
+++ b/trunk/drivers/scsi/NCR53C9x.c
@@ -1824,7 +1824,10 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
 		/* loop */
 		while (hmuch) {
 			int j, fifo_stuck = 0, newphase;
-			unsigned long flags, timeout;
+			unsigned long timeout;
+#if 0
+			unsigned long flags;
+#endif
 #if 0
 			if ( i % 10 )
 				ESPDATA(("\r"));