diff options
author | Kevin Hao <haokexin@gmail.com> | 2015-03-12 08:32:42 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-17 05:04:31 -0400 |
commit | d610f503612ddb5bf55e477fd48c678b3deab7ca (patch) | |
tree | 04befe087f8f393f70bd8f867225486ff2f2a6dc /drivers/ata/sata_svw.c | |
parent | 8edcee0e1f7dd703a2f3049ea1bc8c19bd945eb6 (diff) |
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/sata_svw.c')
-rw-r--r-- | drivers/ata/sata_svw.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index c630fa812624..4c06f6281d74 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -47,11 +47,7 @@ | |||
47 | #include <scsi/scsi_cmnd.h> | 47 | #include <scsi/scsi_cmnd.h> |
48 | #include <scsi/scsi.h> | 48 | #include <scsi/scsi.h> |
49 | #include <linux/libata.h> | 49 | #include <linux/libata.h> |
50 | 50 | #include <linux/of.h> | |
51 | #ifdef CONFIG_PPC_OF | ||
52 | #include <asm/prom.h> | ||
53 | #include <asm/pci-bridge.h> | ||
54 | #endif /* CONFIG_PPC_OF */ | ||
55 | 51 | ||
56 | #define DRV_NAME "sata_svw" | 52 | #define DRV_NAME "sata_svw" |
57 | #define DRV_VERSION "2.3" | 53 | #define DRV_VERSION "2.3" |
@@ -320,7 +316,6 @@ static u8 k2_stat_check_status(struct ata_port *ap) | |||
320 | return readl(ap->ioaddr.status_addr); | 316 | return readl(ap->ioaddr.status_addr); |
321 | } | 317 | } |
322 | 318 | ||
323 | #ifdef CONFIG_PPC_OF | ||
324 | static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) | 319 | static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) |
325 | { | 320 | { |
326 | struct ata_port *ap; | 321 | struct ata_port *ap; |
@@ -350,14 +345,10 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) | |||
350 | } | 345 | } |
351 | return 0; | 346 | return 0; |
352 | } | 347 | } |
353 | #endif /* CONFIG_PPC_OF */ | ||
354 | |||
355 | 348 | ||
356 | static struct scsi_host_template k2_sata_sht = { | 349 | static struct scsi_host_template k2_sata_sht = { |
357 | ATA_BMDMA_SHT(DRV_NAME), | 350 | ATA_BMDMA_SHT(DRV_NAME), |
358 | #ifdef CONFIG_PPC_OF | ||
359 | .show_info = k2_sata_show_info, | 351 | .show_info = k2_sata_show_info, |
360 | #endif | ||
361 | }; | 352 | }; |
362 | 353 | ||
363 | 354 | ||