Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 193515d5 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines

parent 0b154bb7

drivers/scsi/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/ata_piix.c

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <linux/blkdev.h>

#include <linux/delay.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -128,7 +127,7 @@ static struct pci_driver piix_pci_driver = { 
	.remove			= ata_pci_remove_one,

};



static Scsi_Host_Template piix_sht = {

static struct scsi_host_template piix_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

drivers/scsi/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
#include <linux/jiffies.h>

#include <linux/scatterlist.h>

#include <scsi/scsi.h>

#include "scsi.h"

#include "scsi_priv.h"

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_host.h>

#include <linux/libata.h>

#include <asm/io.h>

drivers/scsi/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ 
#include <linux/blkdev.h>

#include <linux/spinlock.h>

#include <scsi/scsi.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_request.h>

#include <linux/libata.h>

#include <linux/hdreg.h>

#include <asm/uaccess.h>

drivers/scsi/pdc_adma.c

+1 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <asm/io.h>

#include <linux/libata.h>
@@ -139,7 +138,7 @@ static u8 adma_bmdma_status(struct ata_port *ap); 
static void adma_irq_clear(struct ata_port *ap);

static void adma_eng_timeout(struct ata_port *ap);



static Scsi_Host_Template adma_ata_sht = {

static struct scsi_host_template adma_ata_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,