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 'dmaengine-fix-4.4-rc6' of git://git.infradead.org/users/vkoul/slave-dma
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_marvell.c
diff --git
a/drivers/ata/pata_marvell.c
b/drivers/ata/pata_marvell.c
index 6bad3df3a13c7741095ac7e88c80d7d7e75d98c4..ae9feb1ba8f74284ed33828bad85476c3b13623f 100644
(file)
--- a/
drivers/ata/pata_marvell.c
+++ b/
drivers/ata/pata_marvell.c
@@
-171,7
+171,7
@@
static struct pci_driver marvell_pci_driver = {
.id_table = marvell_pci_tbl,
.probe = marvell_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