diff options
| author | Jeff Garzik | 2005-11-07 06:59:37 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2005-11-07 06:59:37 +0100 |
| commit | 193515d51ccb363165d6b09e9ba5c21089e34bad (patch) | |
| tree | 9eec151ee1c2091640862adf79f99eca024a98f1 /drivers/scsi/ahci.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | kernel-qcow2-linux-193515d51ccb363165d6b09e9ba5c21089e34bad.tar.gz kernel-qcow2-linux-193515d51ccb363165d6b09e9ba5c21089e34bad.tar.xz kernel-qcow2-linux-193515d51ccb363165d6b09e9ba5c21089e34bad.zip | |
[libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 4612312c0c2d..10c470e7d316 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -42,8 +42,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> @@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap); static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); static void ahci_remove_one (struct pci_dev *pdev); -static Scsi_Host_Template ahci_sht = { +static struct scsi_host_template ahci_sht = { .module = THIS_MODULE, .name = DRV_NAME, .ioctl = ata_scsi_ioctl, |