linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / plat-omap / pm.c

diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 04b4102..093efd7 100644 (file)
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -38,7 +38,6 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>
@@ -580,7 +579,7 @@ static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,
 
 static struct irqaction omap_wakeup_irq = {
        .name           = "peripheral wakeup",
-       .flags          = IRQF_DISABLED,
+       .flags          = SA_INTERRUPT,
        .handler        = omap_wakeup_interrupt
 };