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

diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 2bfede324ea..c42b2d3eeb6 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -39,8 +39,8 @@
 #include <linux/interrupt.h>
 #include <linux/sched.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>
 #include "sata_promise.h"
@@ -177,7 +177,7 @@ static void pdc20621_irq_clear(struct ata_port *ap);
 static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc);
 
 
-static Scsi_Host_Template pdc_sata_sht = {
+static struct scsi_host_template pdc_sata_sht = {
 	.module			= THIS_MODULE,
 	.name			= DRV_NAME,
 	.ioctl			= ata_scsi_ioctl,