From ec67d4e783a0c392c01f5a5eac244952a72c175c Mon Sep 17 00:00:00 2001
From: Karsten Keil <kkeil@suse.de>
Date: Thu, 29 Jun 2006 13:14:51 +0200
Subject: [PATCH] --- yaml --- r: 31223 b: refs/heads/master c:
 0f6c10ead876492b386a19474e6dca4710eeef8e h: refs/heads/master i:   31221:
 9d704ee5a93070d852119d47dcc0df7fd9c81485   31219:
 6db4c016829c0c9dc5d9d34404ea0b025767fa0a   31215:
 6e8a044246537af729751ec0533fe365afdaa74d v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/isdn/hardware/avm/b1pcmcia.c | 2 +-
 trunk/drivers/isdn/hisax/sedlbauer_cs.c    | 2 +-
 trunk/drivers/isdn/hisax/teles3.c          | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5e148d4441ef..a0e5bd576675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0950c358ee8e969fce45ba363ca1deaf211e57b0
+refs/heads/master: 0f6c10ead876492b386a19474e6dca4710eeef8e
diff --git a/trunk/drivers/isdn/hardware/avm/b1pcmcia.c b/trunk/drivers/isdn/hardware/avm/b1pcmcia.c
index 9746cc5ffff8..ad5025155b4e 100644
--- a/trunk/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/trunk/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -82,7 +82,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq,
 	card->irq = irq;
 	card->cardtype = cardtype;
 
-	retval = request_irq(card->irq, b1_interrupt, 0, card->name, card);
+	retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card);
 	if (retval) {
 		printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n",
 		       card->irq);
diff --git a/trunk/drivers/isdn/hisax/sedlbauer_cs.c b/trunk/drivers/isdn/hisax/sedlbauer_cs.c
index 9bb18f3f7829..f9c14a2970bc 100644
--- a/trunk/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/trunk/drivers/isdn/hisax/sedlbauer_cs.c
@@ -164,7 +164,7 @@ static int sedlbauer_probe(struct pcmcia_device *link)
     link->priv = local;
 
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 
diff --git a/trunk/drivers/isdn/hisax/teles3.c b/trunk/drivers/isdn/hisax/teles3.c
index a3eaf4d65707..090abd16b4bc 100644
--- a/trunk/drivers/isdn/hisax/teles3.c
+++ b/trunk/drivers/isdn/hisax/teles3.c
@@ -369,6 +369,7 @@ setup_teles3(struct IsdnCard *card)
 			       cs->hw.teles3.hscx[1] + 96);
 			return (0);
 		}
+		cs->irq_flags |= SA_SHIRQ; /* cardbus can share */
 	} else {
 		if (cs->hw.teles3.cfg_reg) {
 			if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {