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 branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_cypress.c
diff --git
a/drivers/ata/pata_cypress.c
b/drivers/ata/pata_cypress.c
index 3435bd6a5cc918984ba7aee85cfc8e4435e7106c..793018460d8200b74da64f6b84f052ed07ddb325 100644
(file)
--- a/
drivers/ata/pata_cypress.c
+++ b/
drivers/ata/pata_cypress.c
@@
-151,7
+151,7
@@
static struct pci_driver cy82c693_pci_driver = {
.id_table = cy82c693,
.probe = cy82c693_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