git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
pm.c
diff --git
a/arch/arm/mach-omap1/pm.c
b/arch/arm/mach-omap1/pm.c
index d9805e3d930400de42e49afd8216e3a8c71bb745..06b7e54a01280f8b92a33fe9cd66f8d3bd7fb492 100644
(file)
--- a/
arch/arm/mach-omap1/pm.c
+++ b/
arch/arm/mach-omap1/pm.c
@@
-639,7
+639,7
@@
static void omap_pm_finish(void)
}
-static irqreturn_t
omap_wakeup_interrupt(int irq, void *dev)
+static irqreturn_t omap_wakeup_interrupt(int irq, void *dev)
{
return IRQ_HANDLED;
}