---

yaml --- r: 297807 b: refs/heads/master c: 5bbda4e h: refs/heads/master i: 297805: c79f400 297803: e0863c9 297799: 4b8b1e4 297791: 9d437c0 v: v3
git-mirror · Jan 24, 2012 · 9d28db2 · 9d28db2
1 parent 62c2541
commit 9d28db2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fbebcbdb3730666c0d1d22021a90d8483fc8e02
+refs/heads/master: 5bbda4e4aca4591c85ee53dea157ca5fc9a23306
diff --git a/trunk/drivers/sh/intc/chip.c b/trunk/drivers/sh/intc/chip.c
@@ -58,11 +58,6 @@ static void intc_disable(struct irq_data *data)
 	}
 }
 
-static int intc_set_wake(struct irq_data *data, unsigned int on)
-{
-	return 0; /* allow wakeup, but setup hardware in intc_suspend() */
-}
-
 #ifdef CONFIG_SMP
 /*
  * This is held with the irq desc lock held, so we don't require any
@@ -225,8 +220,8 @@ struct irq_chip intc_irq_chip	= {
 	.irq_disable		= intc_disable,
 	.irq_shutdown		= intc_disable,
 	.irq_set_type		= intc_set_type,
-	.irq_set_wake		= intc_set_wake,
 #ifdef CONFIG_SMP
 	.irq_set_affinity	= intc_set_affinity,
 #endif
+	.flags			= IRQCHIP_SKIP_SET_WAKE,
 };