projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af410fc
)
[PATCH] CONFIG_PM=n slim: drivers/parport/parport_serial.c
author
Alexey Dobriyan
<adobriyan@gmail.com>
Fri, 29 Sep 2006 09:00:16 +0000
(
02:00
-0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 29 Sep 2006 16:18:13 +0000
(09:18 -0700)
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/parport/parport_serial.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/parport/parport_serial.c
b/drivers/parport/parport_serial.c
index 98b83a85c60e2d462fe92e4e39de2e6f0e977945..78c0a269a2ba3e24200b0c13e72a70c99b978141 100644
(file)
--- a/
drivers/parport/parport_serial.c
+++ b/
drivers/parport/parport_serial.c
@@
-374,6
+374,7
@@
static void __devexit parport_serial_pci_remove (struct pci_dev *dev)
return;
}
+#ifdef CONFIG_PM
static int parport_serial_pci_suspend(struct pci_dev *dev, pm_message_t state)
{
struct parport_serial_private *priv = pci_get_drvdata(dev);
@@
-407,14
+408,17
@@
static int parport_serial_pci_resume(struct pci_dev *dev)
return 0;
}
+#endif
static struct pci_driver parport_serial_pci_driver = {
.name = "parport_serial",
.id_table = parport_serial_pci_tbl,
.probe = parport_serial_pci_probe,
.remove = __devexit_p(parport_serial_pci_remove),
+#ifdef CONFIG_PM
.suspend = parport_serial_pci_suspend,
.resume = parport_serial_pci_resume,
+#endif
};