fbdev: export fb_destroy_modelist

[linux-2.6-omap-h63xx.git] / drivers / scsi / g_NCR5380.c

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 67f1100f310361708647f4c28952895a608dc82f..607336f56d550b8a6d487d3c1a723877c7641b32 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -103,7 +103,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/signal.h>
-#include <linux/sched.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
@@ -557,7 +556,7 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
 }
 #endif
 
-#if NCR53C400_PSEUDO_DMA
+#ifdef NCR53C400_PSEUDO_DMA
 
 /**
  *     NCR5380_pread           -       pseudo DMA read
@@ -811,7 +810,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 +849,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];