merge by hand - fix up rejections in Documentation/DocBook/Makefile

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 74293f62a622..064781a2cb1a 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/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"));