From 9d28db21e6da2d4d956cc6cd9560f2ee98356cf6 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 24 Jan 2012 14:54:10 +0900
Subject: [PATCH] --- yaml --- r: 297807 b: refs/heads/master c:
 5bbda4e4aca4591c85ee53dea157ca5fc9a23306 h: refs/heads/master i:   297805:
 c79f4003feecde95d8ad70a51bd5288e4850bd3a   297803:
 e0863c958cc32b9329a71e59c94f53b79db96caf   297799:
 4b8b1e423b6c34af1c6e469d811f4d1776d195e3   297791:
 9d437c0357e462881f5948e7f633eaaad032b741 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/sh/intc/chip.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 94a73fb9c513..49c3bc5b87af 100644
--- 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
index 7b246efa94ea..3679645427c1 100644
--- 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,
 };