Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[pandora-kernel.git] / drivers / scsi / fcal.c

diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index 0341654..c4e16c0 100644 (file)
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -13,7 +13,6 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
@@ -249,8 +248,7 @@ int fcal_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t of
                                if (scd->id == target) {
                                        SPRINTF ("  [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x]  ",
                                                alpa, target, u1[0], u1[1], u2[0], u2[1]);
-                                       SPRINTF ("%s ", (scd->type < MAX_SCSI_DEVICE_CODE) ?
-                                               scsi_device_types[(short) scd->type] : "Unknown device");
+                                       SPRINTF ("%s ", scsi_device_type(scd->type));
 
                                        for (j = 0; (j < 8) && (scd->vendor[j] >= 0x20); j++)
                                                SPRINTF ("%c", scd->vendor[j]);