sata_svw: remove the dependency on PPC_OF
The OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on PPC_OF option any more. This is a preparation for killing PPC_OF. Signed-off-by: Kevin Hao <haokexin@gmail.com> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
8edcee0e1f
commit
d610f50361
|
@ -47,11 +47,7 @@
|
||||||
#include <scsi/scsi_cmnd.h>
|
#include <scsi/scsi_cmnd.h>
|
||||||
#include <scsi/scsi.h>
|
#include <scsi/scsi.h>
|
||||||
#include <linux/libata.h>
|
#include <linux/libata.h>
|
||||||
|
#include <linux/of.h>
|
||||||
#ifdef CONFIG_PPC_OF
|
|
||||||
#include <asm/prom.h>
|
|
||||||
#include <asm/pci-bridge.h>
|
|
||||||
#endif /* CONFIG_PPC_OF */
|
|
||||||
|
|
||||||
#define DRV_NAME "sata_svw"
|
#define DRV_NAME "sata_svw"
|
||||||
#define DRV_VERSION "2.3"
|
#define DRV_VERSION "2.3"
|
||||||
|
@ -320,7 +316,6 @@ static u8 k2_stat_check_status(struct ata_port *ap)
|
||||||
return readl(ap->ioaddr.status_addr);
|
return readl(ap->ioaddr.status_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_OF
|
|
||||||
static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
|
static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
|
||||||
{
|
{
|
||||||
struct ata_port *ap;
|
struct ata_port *ap;
|
||||||
|
@ -350,14 +345,10 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_PPC_OF */
|
|
||||||
|
|
||||||
|
|
||||||
static struct scsi_host_template k2_sata_sht = {
|
static struct scsi_host_template k2_sata_sht = {
|
||||||
ATA_BMDMA_SHT(DRV_NAME),
|
ATA_BMDMA_SHT(DRV_NAME),
|
||||||
#ifdef CONFIG_PPC_OF
|
|
||||||
.show_info = k2_sata_show_info,
|
.show_info = k2_sata_show_info,
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue