diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
| commit | 8006fdd6dc387abaa4b683bda4868c879fd76070 (patch) | |
| tree | 314b08f4923dd9ab24930e6b2ac75889c244b154 /drivers/scsi/sata_uli.c | |
| parent | 18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (diff) | |
| parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_uli.c')
| -rw-r--r-- | drivers/scsi/sata_uli.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index a5e245c098e1..cf0baaa4e045 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/device.h> | 35 | #include <linux/device.h> |
| 36 | #include "scsi.h" | ||
| 37 | #include <scsi/scsi_host.h> | 36 | #include <scsi/scsi_host.h> |
| 38 | #include <linux/libata.h> | 37 | #include <linux/libata.h> |
| 39 | 38 | ||
| @@ -71,7 +70,7 @@ static struct pci_driver uli_pci_driver = { | |||
| 71 | .remove = ata_pci_remove_one, | 70 | .remove = ata_pci_remove_one, |
| 72 | }; | 71 | }; |
| 73 | 72 | ||
| 74 | static Scsi_Host_Template uli_sht = { | 73 | static struct scsi_host_template uli_sht = { |
| 75 | .module = THIS_MODULE, | 74 | .module = THIS_MODULE, |
| 76 | .name = DRV_NAME, | 75 | .name = DRV_NAME, |
| 77 | .ioctl = ata_scsi_ioctl, | 76 | .ioctl = ata_scsi_ioctl, |