diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:57:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:57:38 +0200 |
| commit | afdb094380889222583df9ef803587f6b8a82c8d (patch) | |
| tree | 4a03c516568e5c8b994a5739f3d34f4552c78898 /include/linux/ahci_platform.h | |
| parent | be11e6d86081aa6328eaa4fe6dd14ccf39a023c8 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into timers/core
Reason: Bring in upstream modifications, so the pending changes which
depend on them can be queued.
Diffstat (limited to 'include/linux/ahci_platform.h')
| -rw-r--r-- | include/linux/ahci_platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h index 1f16d502600c..6dfd51a04d77 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -44,6 +44,7 @@ struct ahci_host_priv *ahci_platform_get_resources( 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); |