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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[cascardo/linux.git]
/
drivers
/
ata
/
pata_artop.c
diff --git
a/drivers/ata/pata_artop.c
b/drivers/ata/pata_artop.c
index
3aa4e65
..
96c05c9
100644
(file)
--- a/
drivers/ata/pata_artop.c
+++ b/
drivers/ata/pata_artop.c
@@
-422,7
+422,7
@@
static const struct pci_device_id artop_pci_tbl[] = {
{ } /* terminate list */
};
{ } /* terminate list */
};
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int atp8xx_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
static int atp8xx_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
@@
-444,7
+444,7
@@
static struct pci_driver artop_pci_driver = {
.id_table = artop_pci_tbl,
.probe = artop_init_one,
.remove = ata_pci_remove_one,
.id_table = artop_pci_tbl,
.probe = artop_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = atp8xx_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = atp8xx_reinit_one,
#endif