From c9446a77884186ece5083488488923c086c43052 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 9 Mar 2010 17:17:36 +0100
Subject: [PATCH] --- yaml --- r: 188111 b: refs/heads/master c:
 b416cd8efb6ce2661f8f98f603972f0b8f796ee4 h: refs/heads/master i:   188109:
 0c2ecb00c58bb160bdbb3ebaa3885586e61f9204   188107:
 bf6051ebe8481176e16247d2afbfe56f468a29c7   188103:
 3cf98d1b117203c4fc908b6ff9db822130cf0eb1   188095:
 5471ef9732533e9f3bf065804ffde09273dccff4 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pcmcia/pcmcia_resource.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 28d32fd862e4..de7ec1b85407 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a96e87d6e58a07235a2bc3eff9b093af4937a72
+refs/heads/master: b416cd8efb6ce2661f8f98f603972f0b8f796ee4
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
index b2df04199a21..ef782c09f029 100644
--- a/trunk/drivers/pcmcia/pcmcia_resource.c
+++ b/trunk/drivers/pcmcia/pcmcia_resource.c
@@ -752,14 +752,6 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
 
 #ifdef CONFIG_PCMCIA_PROBE
 
-#ifdef IRQ_NOAUTOEN
-	/* if the underlying IRQ infrastructure allows for it, only allocate
-	 * the IRQ, but do not enable it
-	 */
-	if (!(req->Handler))
-		type |= IRQ_NOAUTOEN;
-#endif /* IRQ_NOAUTOEN */
-
 	if (s->irq.AssignedIRQ != 0) {
 		/* If the interrupt is already assigned, it must be the same */
 		irq = s->irq.AssignedIRQ;