summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-04 10:24:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-04 10:24:26 -0700
commite17acfdc83b877794c119fac4627e80510ea3c09 (patch)
tree948f414e05e374a855236a416d84b1e9a94a5a47 /include
parent47dfe4037e37b2843055ea3feccf1c335ea23a9c (diff)
parentc4121c650e5c798c852e981c245caa6713c0d99e (diff)
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata changes from Tejun Heo: "Except for a few, all the changes are for ahci platform drivers for the arm devices. Nothing too interesting or dangerous. There's one merge from libata/for-3.16-fixes to pull in dependent changes" * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits) ata: libahci: Silence compiler warning on 64-bit Documentation: bindings: document the sub-nodes AHCI bindings ata: ahci_platform: add a generic AHCI compatible ata: libahci: allow to use multiple PHYs ata: libahci_platform: move port_map parameters into the AHCI structure ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable() ahci_xgene: Use correct OOB tunning parameters for APM X-Gene SoC AHCI SATA Host controller driver. ahci_xgene: Fix the watermark threshold for the APM X-Gene SATA host controller driver. ahci: st: Make of_device_id array const sata_sil24: Identify which card suffered IRQ status error ahci: st: Provide DT bindings for ST's SATA implementation ata: Add support for the Tegra124 SATA controller ata: ahci_platform: Increase AHCI_MAX_CLKS to 4 of: Add NVIDIA Tegra SATA controller binding dt-bindings: ata: document ability to disable spread-spectrum clock ata: ahci_imx: add disable for spread-spectrum dt-bindings: ata: add ahci_imx electrical properties ata: ahci_imx: allow hardware parameters to be specified in DT dt-bindings: ata: create bindings for imx sata controller ata: pata_samsung_cf: removes s5pc100 related ata codes ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/ahci_platform.h5
-rw-r--r--include/linux/platform_data/ata-samsung_cf.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index 6dfd51a04d77..09a947e8bc87 100644
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -43,10 +43,7 @@ struct ahci_host_priv *ahci_platform_get_resources(
struct platform_device *pdev);
int ahci_platform_init_host(struct platform_device *pdev,
struct ahci_host_priv *hpriv,
- const struct ata_port_info *pi_template,
- unsigned long host_flags,
- unsigned int force_port_map,
- unsigned int mask_port_map);
+ const struct ata_port_info *pi_template);
int ahci_platform_suspend_host(struct device *dev);
int ahci_platform_resume_host(struct device *dev);
diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h
index c2049e3d7444..748e71642c4a 100644
--- a/include/linux/platform_data/ata-samsung_cf.h
+++ b/include/linux/platform_data/ata-samsung_cf.h
@@ -29,7 +29,6 @@ extern void s3c_ide_set_platdata(struct s3c_ide_platdata *pdata);
/* architecture-specific IDE configuration */
extern void s3c64xx_ide_setup_gpio(void);
-extern void s5pc100_ide_setup_gpio(void);
extern void s5pv210_ide_setup_gpio(void);
#endif /*__ATA_SAMSUNG_CF_H */