From 2d620a2e432757783bf6e547a93e6beabeb344d1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 25 Aug 2010 11:20:25 +0800
Subject: [PATCH] --- yaml --- r: 220585 b: refs/heads/master c:
 1203a1e6424d502e9c12d29512218487af5fdd1c h: refs/heads/master i:   220583:
 d003c4805cb3f6972e23e28587f37f7a8c6fc140 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mfd/htc-pasic3.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3fedab1417c6..fad37751904b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 929980ab1b90b5a5c93db9b9b7d58cc6e93049c8
+refs/heads/master: 1203a1e6424d502e9c12d29512218487af5fdd1c
diff --git a/trunk/drivers/mfd/htc-pasic3.c b/trunk/drivers/mfd/htc-pasic3.c
index f04300e05fd6..7bc752272dc1 100644
--- a/trunk/drivers/mfd/htc-pasic3.c
+++ b/trunk/drivers/mfd/htc-pasic3.c
@@ -138,13 +138,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
 		irq = r->start;
 	}
 
-	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (r) {
-		ds1wm_resources[1].flags = IORESOURCE_IRQ | (r->flags &
-			(IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE));
-		irq = r->start;
-	}
-
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!r)
 		return -ENXIO;