Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 09fd203e4b86d480ee1fda1f15986f16be5ca10e..7cd366fcc57112a3665fb8ef3c0788accf566cd2 100644 (file)
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/blkdev.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
@@ -218,7 +217,7 @@ static inline void init_hpc_chain(struct hpc_data *hd)
 }
 
 static struct Scsi_Host * __init sgiwd93_setup_scsi(
-       Scsi_Host_Template *SGIblows, int unit, int irq,
+       struct scsi_host_template *SGIblows, int unit, int irq,
        struct hpc3_scsiregs *hregs, unsigned char *wdregs)
 {
        struct ip22_hostdata *hdata;
@@ -266,7 +265,7 @@ out_unregister:
        return NULL;
 }
 
-int __init sgiwd93_detect(Scsi_Host_Template *SGIblows)
+static int __init sgiwd93_detect(struct scsi_host_template *SGIblows)
 {
        int found = 0;
 
@@ -289,7 +288,7 @@ int __init sgiwd93_detect(Scsi_Host_Template *SGIblows)
        return found;
 }
 
-int sgiwd93_release(struct Scsi_Host *instance)
+static int sgiwd93_release(struct Scsi_Host *instance)
 {
        struct ip22_hostdata *hdata = HDATA(instance);
        int irq = 0;
@@ -325,7 +324,7 @@ static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
  * arguments not with pointers.  So this is going to blow up beautyfully
  * on 64-bit systems with memory outside the compat address spaces.
  */
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .proc_name              = "SGIWD93",
        .name                   = "SGI WD93",
        .detect                 = sgiwd93_detect,