diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:20:26 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:20:26 +0100 |
| commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
| tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /drivers/scsi/sata_sx4.c | |
| parent | Merge branch 'master' (diff) | |
| parent | [PATCH] libata kernel-doc fixes (diff) | |
| download | linux-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.xz linux-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
| -rw-r--r-- | drivers/scsi/sata_sx4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 2bfede324eac..c42b2d3eeb6c 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, |