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 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_piccolo.c
diff --git
a/drivers/ata/pata_piccolo.c
b/drivers/ata/pata_piccolo.c
index
0b46be1
..
35cb0e2
100644
(file)
--- a/
drivers/ata/pata_piccolo.c
+++ b/
drivers/ata/pata_piccolo.c
@@
-110,7
+110,7
@@
static struct pci_driver ata_tosh_pci_driver = {
.id_table = ata_tosh,
.probe = ata_tosh_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