Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / drivers / scsi / NCR_D700.c

diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index 8c0fc3f..802f907 100644 (file)
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -98,8 +98,6 @@
 #include <linux/module.h>
 #include <linux/mca.h>
 #include <asm/io.h>
-
-#include "scsi.h"
 #include <scsi/scsi_host.h>
 
 #include "53c700.h"
@@ -156,7 +154,7 @@ param_setup(char *string)
 
 /* Host template.  The 53c700 routine NCR_700_detect will
  * fill in all of the missing routines */
-static Scsi_Host_Template NCR_D700_driver_template = {
+static struct scsi_host_template NCR_D700_driver_template = {
        .module                 = THIS_MODULE,
        .name                   = "NCR Dual 700 MCA",
        .proc_name              = "NCR_D700",