diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 17:58:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 17:58:36 -0400 |
commit | 6ea4fa70e4af0da8b133b246458fb789d8cb3985 (patch) | |
tree | af90ad8668d6856a9df023db9f3215dfc3e1d4e3 /drivers/ata/pata_triflex.c | |
parent | da85d191f58a44e149a7c07dbae78b3042909798 (diff) | |
parent | d251836508fb26cd1a22b41381739835ee23728d (diff) |
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"Nothing too interesting - another ahci platform driver variant,
additional controller support, minor fixes and cleanups"
* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci: Add Device ID for HighPoint RocketRaid 642L
ata: ep93xx: use dmaengine_prep_slave_sg api instead of internal callback
ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
sata_fsl: remove check for CONFIG_MPC8315_DS
ahci: add support for Hisilicon sata
libahci_platform: add host_flags parameter in ahci_platform_init_host()
ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
Documentation: dt-bindings: reformat and order list of ahci-platform compatibles
libata-sff: remove dead code
ata: SATL compliance for Inquiry Product Revision
pata_octeon_cf: use devm_kzalloc() to allocate cf_port
Diffstat (limited to 'drivers/ata/pata_triflex.c')
-rw-r--r-- | drivers/ata/pata_triflex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index 7bc78e264f9e..d9364af8eb63 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c | |||
@@ -207,7 +207,7 @@ static const struct pci_device_id triflex[] = { | |||
207 | { }, | 207 | { }, |
208 | }; | 208 | }; |
209 | 209 | ||
210 | #ifdef CONFIG_PM | 210 | #ifdef CONFIG_PM_SLEEP |
211 | static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) | 211 | static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) |
212 | { | 212 | { |
213 | struct ata_host *host = pci_get_drvdata(pdev); | 213 | struct ata_host *host = pci_get_drvdata(pdev); |
@@ -233,7 +233,7 @@ static struct pci_driver triflex_pci_driver = { | |||
233 | .id_table = triflex, | 233 | .id_table = triflex, |
234 | .probe = triflex_init_one, | 234 | .probe = triflex_init_one, |
235 | .remove = ata_pci_remove_one, | 235 | .remove = ata_pci_remove_one, |
236 | #ifdef CONFIG_PM | 236 | #ifdef CONFIG_PM_SLEEP |
237 | .suspend = triflex_ata_pci_device_suspend, | 237 | .suspend = triflex_ata_pci_device_suspend, |
238 | .resume = ata_pci_device_resume, | 238 | .resume = ata_pci_device_resume, |
239 | #endif | 239 | #endif |