summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_nv.c
diff options
context:
space:
mode:
authorJeff Garzik2005-11-07 06:59:37 +0100
committerJeff Garzik2005-11-07 06:59:37 +0100
commit193515d51ccb363165d6b09e9ba5c21089e34bad (patch)
tree9eec151ee1c2091640862adf79f99eca024a98f1 /drivers/scsi/sata_nv.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff)
downloadkernel-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/sata_nv.c')
-rw-r--r--drivers/scsi/sata_nv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index d573888eda76..37a4fae95ed4 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -62,7 +62,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
-#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
@@ -219,7 +218,7 @@ static struct pci_driver nv_pci_driver = {
.remove = ata_pci_remove_one,
};
-static Scsi_Host_Template nv_sht = {
+static struct scsi_host_template nv_sht = {
.module = THIS_MODULE,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,