From fb0bd054da1d56e2f2744726f5c8460addd5d0dc Mon Sep 17 00:00:00 2001
From: Etienne Carriere <etienne.carriere@st.com>
Date: Wed, 22 Aug 2012 10:44:16 +0200
Subject: [PATCH] --- yaml --- r: 328479 b: refs/heads/master c:
 4921e7452c2c61e0caa1a5039456cbeed3f10324 h: refs/heads/master i:   328477:
 5ad3468aa1eb2baf80108c776eaa4fdef390e4f9   328475:
 83a20a44afa528fccc88b89d90f7953aca1bd9f1   328471:
 d293899d0093a4a6993113ac29fa08a06bea274e   328463:
 2055462c380799bb9ac66bf1031aa5c4078a6143   328447:
 b003e5e59922d0e9458ebf4af7243454989672f3 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/pinctrl/pinctrl-nomadik.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f573aaf82e84..b9d1011fcf35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5fff72db1d7cf1161deed54f6be6d2c96f2ad80
+refs/heads/master: 4921e7452c2c61e0caa1a5039456cbeed3f10324
diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c
index d12df0227561..fae10b311551 100644
--- a/trunk/drivers/pinctrl/pinctrl-nomadik.c
+++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c
@@ -819,6 +819,7 @@ static struct irq_chip nmk_gpio_irq_chip = {
 	.irq_set_wake	= nmk_gpio_irq_set_wake,
 	.irq_startup	= nmk_gpio_irq_startup,
 	.irq_shutdown	= nmk_gpio_irq_shutdown,
+	.flags		= IRQCHIP_MASK_ON_SUSPEND,
 };
 
 static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc,