Merge branch 'upstream'

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

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index b2e2f1825edbc0bd4df6fb440d2dbe93e55658d5..ac5b9cbebdd8b016fa5966b9ac7ddd19de382b88 100644 (file)
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -39,8 +39,8 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/device.h>

-#include "scsi.h"

 #include <scsi/scsi_host.h>
 #include <scsi/scsi_host.h>

+#include <scsi/scsi_cmnd.h>

 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"
 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"


@@ -94,7 +94,7 @@ static void pdc_irq_clear(struct ata_port *ap);
 static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 
 
 static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 
 

-static Scsi_Host_Template pdc_ata_sht = {
+static struct scsi_host_template pdc_ata_sht = {

        .module                 = THIS_MODULE,
        .name                   = DRV_NAME,
        .ioctl                  = ata_scsi_ioctl,
        .module                 = THIS_MODULE,
        .name                   = DRV_NAME,
        .ioctl                  = ata_scsi_ioctl,