projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'
[cascardo/linux.git]
/
drivers
/
ata
/
pata_atiixp.c
diff --git
a/drivers/ata/pata_atiixp.c
b/drivers/ata/pata_atiixp.c
index
30fa4ca
..
970f776
100644
(file)
--- a/
drivers/ata/pata_atiixp.c
+++ b/
drivers/ata/pata_atiixp.c
@@
-298,7
+298,7
@@
static struct pci_driver atiixp_pci_driver = {
.id_table = atiixp,
.probe = atiixp_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.resume = ata_pci_device_resume,
.suspend = ata_pci_device_suspend,
#endif