From 75dbea55fefb33d6cee18fe840a6f75c6abddd31 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Thu, 21 Apr 2011 08:44:45 -0700
Subject: [PATCH] --- yaml --- r: 256700 b: refs/heads/master c:
 bdba15db4d81940776ab96ea9f558b7388b0f7fe h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/gpio/gpio-omap.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f0ba74784e88..935ddee3cfac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df3c851716424fda0c7b14c4cae71cea467a9944
+refs/heads/master: bdba15db4d81940776ab96ea9f558b7388b0f7fe
diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c
index 2ca814294c5e..7135810a77bc 100644
--- a/trunk/drivers/gpio/gpio-omap.c
+++ b/trunk/drivers/gpio/gpio-omap.c
@@ -657,12 +657,6 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
 	void __iomem *reg = bank->base;
 
 	switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-	case METHOD_MPUIO:
-		/* MPUIO irqstatus is reset by reading the status register,
-		 * so do nothing here */
-		return;
-#endif
 #ifdef CONFIG_ARCH_OMAP15XX
 	case METHOD_GPIO_1510:
 		reg += OMAP1510_GPIO_INT_STATUS;