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 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
pm.c
diff --git
a/arch/arm/plat-omap/pm.c
b/arch/arm/plat-omap/pm.c
index
1a24e2c
..
04b4102
100644
(file)
--- a/
arch/arm/plat-omap/pm.c
+++ b/
arch/arm/plat-omap/pm.c
@@
-580,7
+580,7
@@
static irqreturn_t omap_wakeup_interrupt(int irq, void * dev,
static struct irqaction omap_wakeup_irq = {
.name = "peripheral wakeup",
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.handler = omap_wakeup_interrupt
};