projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
ata
/
pata_optidma.c
diff --git
a/drivers/ata/pata_optidma.c
b/drivers/ata/pata_optidma.c
index
78ede3f
..
c8bd4da
100644
(file)
--- a/
drivers/ata/pata_optidma.c
+++ b/
drivers/ata/pata_optidma.c
@@
-441,7
+441,7
@@
static struct pci_driver optidma_pci_driver = {
.id_table = optidma,
.probe = optidma_init_one,
.remove = ata_pci_remove_one,
.id_table = optidma,
.probe = optidma_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