Merge branch 'master'

[linux-2.6] / drivers / scsi / blz1230.c

diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c
index 4cd9fcf4dc505010195763fd87be6042b3794b2d..763e409a1ff37b96684cc9ecd2d6d6a2d17befc6 100644 (file)
--- a/drivers/scsi/blz1230.c
+++ b/drivers/scsi/blz1230.c
@@ -94,7 +94,7 @@ static volatile unsigned char cmd_buffer[16];
                                 */
 
 /***************************************************************** Detection */
-int __init blz1230_esp_detect(Scsi_Host_Template *tpnt)
+int __init blz1230_esp_detect(struct scsi_host_template *tpnt)
 {
        struct NCR_ESP *esp;
        struct zorro_dev *z = NULL;
@@ -328,7 +328,7 @@ int blz1230_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .proc_name              = "esp-blz1230",
        .proc_info              = esp_proc_info,
        .name                   = "Blizzard1230 SCSI IV",