diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
| commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
| tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /drivers/scsi/sata_nv.c | |
| parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
| parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_nv.c')
| -rw-r--r-- | drivers/scsi/sata_nv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 5569d5797134..5b7f7808add9 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | #include <linux/delay.h> | 62 | #include <linux/delay.h> |
| 63 | #include <linux/interrupt.h> | 63 | #include <linux/interrupt.h> |
| 64 | #include <linux/device.h> | 64 | #include <linux/device.h> |
| 65 | #include "scsi.h" | ||
| 66 | #include <scsi/scsi_host.h> | 65 | #include <scsi/scsi_host.h> |
| 67 | #include <linux/libata.h> | 66 | #include <linux/libata.h> |
| 68 | 67 | ||
| @@ -219,7 +218,7 @@ static struct pci_driver nv_pci_driver = { | |||
| 219 | .remove = ata_pci_remove_one, | 218 | .remove = ata_pci_remove_one, |
| 220 | }; | 219 | }; |
| 221 | 220 | ||
| 222 | static Scsi_Host_Template nv_sht = { | 221 | static struct scsi_host_template nv_sht = { |
| 223 | .module = THIS_MODULE, | 222 | .module = THIS_MODULE, |
| 224 | .name = DRV_NAME, | 223 | .name = DRV_NAME, |
| 225 | .ioctl = ata_scsi_ioctl, | 224 | .ioctl = ata_scsi_ioctl, |