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 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
pm.c
diff --git
a/arch/arm/mach-omap1/pm.c
b/arch/arm/mach-omap1/pm.c
index
0cca23a
..
98ba978
100644
(file)
--- a/
arch/arm/mach-omap1/pm.c
+++ b/
arch/arm/mach-omap1/pm.c
@@
-647,7
+647,7
@@
static struct irqaction omap_wakeup_irq = {
-static
struct platform_suspend_ops omap_pm_ops =
{
+static
const struct platform_suspend_ops omap_pm_ops =
{
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,