projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_atp867x.c
diff --git
a/drivers/ata/pata_atp867x.c
b/drivers/ata/pata_atp867x.c
index
7e73a0f
..
a705cfc
100644
(file)
--- a/
drivers/ata/pata_atp867x.c
+++ b/
drivers/ata/pata_atp867x.c
@@
-530,7
+530,7
@@
err_out:
return rc;
}
return rc;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int atp867x_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
static int atp867x_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
@@
-558,7
+558,7
@@
static struct pci_driver atp867x_driver = {
.id_table = atp867x_pci_tbl,
.probe = atp867x_init_one,
.remove = ata_pci_remove_one,
.id_table = atp867x_pci_tbl,
.probe = atp867x_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = atp867x_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = atp867x_reinit_one,
#endif