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_ns87415.c
diff --git
a/drivers/ata/pata_ns87415.c
b/drivers/ata/pata_ns87415.c
index
16dc3a6
..
8e7f37e
100644
(file)
--- a/
drivers/ata/pata_ns87415.c
+++ b/
drivers/ata/pata_ns87415.c
@@
-386,7
+386,7
@@
static const struct pci_device_id ns87415_pci_tbl[] = {
{ } /* terminate list */
};
{ } /* terminate list */
};
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int ns87415_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
static int ns87415_reinit_one(struct pci_dev *pdev)
{
struct ata_host *host = pci_get_drvdata(pdev);
@@
-408,7
+408,7
@@
static struct pci_driver ns87415_pci_driver = {
.id_table = ns87415_pci_tbl,
.probe = ns87415_init_one,
.remove = ata_pci_remove_one,
.id_table = ns87415_pci_tbl,
.probe = ns87415_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = ns87415_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = ns87415_reinit_one,
#endif