From 412f3176597c57cd55a256046211f7b7191349c9 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Fri, 2 May 2008 14:21:50 +0100
Subject: [PATCH] --- yaml --- r: 95833 b: refs/heads/master c:
 392512fbf9407fa1647225143e3f9c28a869ac57 h: refs/heads/master i:   95831:
 25a5f7901f136d0eb3cc06988ab4c22acf718748 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/scsi/u14-34f.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c1c60d7f996a..e585d0f85ff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ed43910956f5faec690ea3214451779e93bbb52
+refs/heads/master: 392512fbf9407fa1647225143e3f9c28a869ac57
diff --git a/trunk/drivers/scsi/u14-34f.c b/trunk/drivers/scsi/u14-34f.c
index 640333b1e75c..329eb8780e74 100644
--- a/trunk/drivers/scsi/u14-34f.c
+++ b/trunk/drivers/scsi/u14-34f.c
@@ -744,7 +744,8 @@ static int wait_on_busy(unsigned long iobase, unsigned int loop) {
 static int board_inquiry(unsigned int j) {
    struct mscp *cpp;
    dma_addr_t id_dma_addr;
-   unsigned int time, limit = 0;
+   unsigned int limit = 0;
+   unsigned long time;
 
    id_dma_addr = pci_map_single(HD(j)->pdev, HD(j)->board_id,
                     sizeof(HD(j)->board_id), PCI_DMA_BIDIRECTIONAL);
@@ -1392,7 +1393,8 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) {
 }
 
 static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) {
-   unsigned int i, j, time, k, c, limit = 0;
+   unsigned int i, j, k, c, limit = 0;
+   unsigned long time;
    int arg_done = FALSE;
    struct scsi_cmnd *SCpnt;