Merge branch 'master' into upstream

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 67f1100f3103..cdd893bb4e28 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -811,7 +811,6 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
         struct NCR5380_hostdata *hostdata;
 #ifdef NCR5380_STATS
         struct scsi_device *dev;
-        extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
 #endif
 
         NCR5380_setup(scsi_ptr);
@@ -851,7 +850,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
                 long tr = hostdata->time_read[dev->id] / HZ;
                 long tw = hostdata->time_write[dev->id] / HZ;
 
-                PRINTP("  T:%d %s " ANDP dev->id ANDP(dev->type < MAX_SCSI_DEVICE_CODE) ? scsi_device_types[(int) dev->type] : "Unknown");
+                PRINTP("  T:%d %s " ANDP dev->id ANDP scsi_device_type(dev->type));
                 for (i = 0; i < 8; i++)
                         if (dev->vendor[i] >= 0x20)
                                 *(buffer + (len++)) = dev->vendor[i];