projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_acpi.c
diff --git
a/drivers/ata/pata_acpi.c
b/drivers/ata/pata_acpi.c
index
5d3920f
..
0f6f7bc
100644
(file)
--- a/
drivers/ata/pata_acpi.c
+++ b/
drivers/ata/pata_acpi.c
@@
-370,8
+370,10
@@
static struct pci_driver pacpi_pci_driver = {
.id_table = pacpi_pci_tbl,
.probe = pacpi_init_one,
.remove = ata_pci_remove_one,
+#ifdef CONFIG_PM
.suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume,
+#endif
};
static int __init pacpi_init(void)