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 'sound-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_via.c
diff --git
a/drivers/ata/pata_via.c
b/drivers/ata/pata_via.c
index f6c9632bdff6a11c6fbdcc18d7ff703d1c4b20cc..1ca6bcab369f015dffc43718b985d58717eabce5 100644
(file)
--- a/
drivers/ata/pata_via.c
+++ b/
drivers/ata/pata_via.c
@@
-659,7
+659,7
@@
static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0);
}
return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0);
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
/**
* via_reinit_one - reinit after resume
* @pdev; PCI device
/**
* via_reinit_one - reinit after resume
* @pdev; PCI device
@@
-704,7
+704,7
@@
static struct pci_driver via_pci_driver = {
.id_table = via,
.probe = via_init_one,
.remove = ata_pci_remove_one,
.id_table = via,
.probe = via_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = via_reinit_one,
#endif
.suspend = ata_pci_device_suspend,
.resume = via_reinit_one,
#endif