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 tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_sil680.c
diff --git
a/drivers/ata/pata_sil680.c
b/drivers/ata/pata_sil680.c
index 73fe362d97161dffcb75a514c41b65fb9a5baf0b..f597edccedecd1ab952d95fd0dd178e4c1be8c4c 100644
(file)
--- a/
drivers/ata/pata_sil680.c
+++ b/
drivers/ata/pata_sil680.c
@@
-403,7
+403,7
@@
use_ioports:
return ata_pci_bmdma_init_one(pdev, ppi, &sil680_sht, NULL, 0);
}
return ata_pci_bmdma_init_one(pdev, ppi, &sil680_sht, NULL, 0);
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int sil680_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
static int sil680_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
@@
-429,7
+429,7
@@
static struct pci_driver sil680_pci_driver = {
.id_table = sil680,
.probe = sil680_init_one,
.remove = ata_pci_remove_one,
.id_table = sil680,
.probe = sil680_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = sil680_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = sil680_reinit_one,
#endif