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 'v3.18' into for_next
[cascardo/linux.git]
/
drivers
/
ata
/
pata_ns87410.c
diff --git
a/drivers/ata/pata_ns87410.c
b/drivers/ata/pata_ns87410.c
index
6154c3e
..
200e1eb
100644
(file)
--- a/
drivers/ata/pata_ns87410.c
+++ b/
drivers/ata/pata_ns87410.c
@@
-161,7
+161,7
@@
static struct pci_driver ns87410_pci_driver = {
.id_table = ns87410,
.probe = ns87410_init_one,
.remove = ata_pci_remove_one,
.id_table = ns87410,
.probe = ns87410_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume,
#endif
.suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume,
#endif