Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / scsi / advansys.c

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index c67e401..d814588 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -2511,8 +2511,8 @@ static void asc_prt_scsi_host(struct Scsi_Host *s)
        struct asc_board *boardp = shost_priv(s);
 
        printk("Scsi_Host at addr 0x%p, device %s\n", s, dev_name(boardp->dev));
-       printk(" host_busy %u, host_no %d, last_reset %d,\n",
-              s->host_busy, s->host_no, (unsigned)s->last_reset);
+       printk(" host_busy %u, host_no %d,\n",
+              s->host_busy, s->host_no);
 
        printk(" base 0x%lx, io_port 0x%lx, irq %d,\n",
               (ulong)s->base, (ulong)s->io_port, boardp->irq);
@@ -3345,8 +3345,8 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
                shost->host_no);
 
        seq_printf(m,
-                  " host_busy %u, last_reset %lu, max_id %u, max_lun %u, max_channel %u\n",
-                  shost->host_busy, shost->last_reset, shost->max_id,
+                  " host_busy %u, max_id %u, max_lun %u, max_channel %u\n",
+                  shost->host_busy, shost->max_id,
                   shost->max_lun, shost->max_channel);
 
        seq_printf(m,