diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /drivers/scsi/ahci.c | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
Merge ../linux-2.6
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, |