summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2015-03-12 20:32:42 +0800
committerMichael Ellerman <mpe@ellerman.id.au>2015-03-17 20:04:31 +1100
commitd610f503612ddb5bf55e477fd48c678b3deab7ca (patch)
tree04befe087f8f393f70bd8f867225486ff2f2a6dc /drivers/ata
parent8edcee0e1f7dd703a2f3049ea1bc8c19bd945eb6 (diff)
downloadop-kernel-dev-d610f503612ddb5bf55e477fd48c678b3deab7ca.zip
op-kernel-dev-d610f503612ddb5bf55e477fd48c678b3deab7ca.tar.gz
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_svw.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index c630fa8..4c06f62 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -47,11 +47,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi.h>
#include <linux/libata.h>
-
-#ifdef CONFIG_PPC_OF
-#include <asm/prom.h>
-#include <asm/pci-bridge.h>
-#endif /* CONFIG_PPC_OF */
+#include <linux/of.h>
#define DRV_NAME "sata_svw"
#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);
}
-#ifdef CONFIG_PPC_OF
static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
{
struct ata_port *ap;
@@ -350,14 +345,10 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
}
return 0;
}
-#endif /* CONFIG_PPC_OF */
-
static struct scsi_host_template k2_sata_sht = {
ATA_BMDMA_SHT(DRV_NAME),
-#ifdef CONFIG_PPC_OF
.show_info = k2_sata_show_info,
-#endif
};
OpenPOWER on IntegriCloud