projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ipvs'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_amd.c
diff --git
a/drivers/ata/pata_amd.c
b/drivers/ata/pata_amd.c
index 1206fa6b62cae199a00302729565915ed931509a..8d4d959a821cab1a356dfde38226caf69ab5129f 100644
(file)
--- a/
drivers/ata/pata_amd.c
+++ b/
drivers/ata/pata_amd.c
@@
-574,7
+574,7
@@
static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0);
}
return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0);
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int amd_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
static int amd_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
@@
-625,7
+625,7
@@
static struct pci_driver amd_pci_driver = {
.id_table = amd,
.probe = amd_init_one,
.remove = ata_pci_remove_one,
.id_table = amd,
.probe = amd_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = amd_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = amd_reinit_one,
#endif