X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=drivers%2Fscsi%2Fsata_mv.c;h=f8976e3f6ada87af62f5407b0f633248d97062dc;hp=a99dad510705c59fa16c13fe468e82c7da8dc662;hb=c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83;hpb=8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index a99dad51070..f8976e3f6ad 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -30,8 +30,8 @@
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
 #include <linux/device.h>
-#include "scsi.h"
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_cmnd.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 
@@ -271,7 +271,7 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance,
 static void mv_eng_timeout(struct ata_port *ap);
 static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 
-static Scsi_Host_Template mv_sht = {
+static struct scsi_host_template mv_sht = {
 	.module			= THIS_MODULE,
 	.name			= DRV_NAME,
 	.ioctl			= ata_scsi_ioctl,