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
/
sata_sis.c
diff --git
a/drivers/ata/sata_sis.c
b/drivers/ata/sata_sis.c
index
1ad2f62
..
9c8f2f0
100644
(file)
--- a/
drivers/ata/sata_sis.c
+++ b/
drivers/ata/sata_sis.c
@@
-83,7
+83,7
@@
static struct pci_driver sis_pci_driver = {
.id_table = sis_pci_tbl,
.probe = sis_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