Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmo...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / mac_scsi.c

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 24828b54773a627a2c866d008cabfbc06aa3b534..858075723c87fc2e010f582385126529ac168fff 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -561,7 +561,8 @@ static int macscsi_pwrite (struct Scsi_Host *instance,
 
 static struct scsi_host_template driver_template = {
        .proc_name                      = "Mac5380",
-       .proc_info                      = macscsi_proc_info,
+       .show_info                      = macscsi_show_info,
+       .write_info                     = macscsi_write_info,
        .name                           = "Macintosh NCR5380 SCSI",
        .detect                         = macscsi_detect,
        .release                        = macscsi_release,