git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
pcspkr.c
diff --git
a/drivers/input/misc/pcspkr.c
b/drivers/input/misc/pcspkr.c
index
6d67af5
..
21cb755
100644
(file)
--- a/
drivers/input/misc/pcspkr.c
+++ b/
drivers/input/misc/pcspkr.c
@@
-114,7
+114,7
@@
static int __devexit pcspkr_remove(struct platform_device *dev)
return 0;
}
return 0;
}
-static int pcspkr_suspend(struct
platform_device *dev, pm_message_t state
)
+static int pcspkr_suspend(struct
device *dev
)
{
pcspkr_event(NULL, EV_SND, SND_BELL, 0);
{
pcspkr_event(NULL, EV_SND, SND_BELL, 0);
@@
-127,14
+127,18
@@
static void pcspkr_shutdown(struct platform_device *dev)
pcspkr_event(NULL, EV_SND, SND_BELL, 0);
}
pcspkr_event(NULL, EV_SND, SND_BELL, 0);
}
+static struct dev_pm_ops pcspkr_pm_ops = {
+ .suspend = pcspkr_suspend,
+};
+
static struct platform_driver pcspkr_platform_driver = {
.driver = {
.name = "pcspkr",
.owner = THIS_MODULE,
static struct platform_driver pcspkr_platform_driver = {
.driver = {
.name = "pcspkr",
.owner = THIS_MODULE,
+ .pm = &pcspkr_pm_ops,
},
.probe = pcspkr_probe,
.remove = __devexit_p(pcspkr_remove),
},
.probe = pcspkr_probe,
.remove = __devexit_p(pcspkr_remove),
- .suspend = pcspkr_suspend,
.shutdown = pcspkr_shutdown,
};
.shutdown = pcspkr_shutdown,
};