Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31223
b: refs/heads/master
c: 0f6c10e
h: refs/heads/master
i:
  31221: 9d704ee
  31219: 6db4c01
  31215: 6e8a044
v: v3
  • Loading branch information
Karsten Keil authored and Linus Torvalds committed Jun 29, 2006
1 parent 0b39b29 commit ec67d4e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0950c358ee8e969fce45ba363ca1deaf211e57b0
refs/heads/master: 0f6c10ead876492b386a19474e6dca4710eeef8e
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hardware/avm/b1pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hisax/sedlbauer_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/isdn/hisax/teles3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ec67d4e

Please sign in to comment.