diff options
Diffstat (limited to 'drivers/isdn/hardware')
-rw-r--r-- | drivers/isdn/hardware/avm/b1pci.c | 4 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/b1pcmcia.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/c4.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/t1pci.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/divasmain.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c index 7edf19b3229..90e2e6643d1 100644 --- a/drivers/isdn/hardware/avm/b1pci.c +++ b/drivers/isdn/hardware/avm/b1pci.c | |||
@@ -97,7 +97,7 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev) | |||
97 | b1_reset(card->port); | 97 | b1_reset(card->port); |
98 | b1_getrevision(card); | 98 | b1_getrevision(card); |
99 | 99 | ||
100 | retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card); | 100 | retval = request_irq(card->irq, b1_interrupt, IRQF_SHARED, card->name, card); |
101 | if (retval) { | 101 | if (retval) { |
102 | printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", card->irq); | 102 | printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", card->irq); |
103 | retval = -EBUSY; | 103 | retval = -EBUSY; |
@@ -234,7 +234,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev) | |||
234 | b1dma_reset(card); | 234 | b1dma_reset(card); |
235 | b1_getrevision(card); | 235 | b1_getrevision(card); |
236 | 236 | ||
237 | retval = request_irq(card->irq, b1dma_interrupt, SA_SHIRQ, card->name, card); | 237 | retval = request_irq(card->irq, b1dma_interrupt, IRQF_SHARED, card->name, card); |
238 | if (retval) { | 238 | if (retval) { |
239 | printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", | 239 | printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", |
240 | card->irq); | 240 | card->irq); |
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c index ad5025155b4..e479c0aef38 100644 --- a/drivers/isdn/hardware/avm/b1pcmcia.c +++ b/drivers/isdn/hardware/avm/b1pcmcia.c | |||
@@ -82,7 +82,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq, | |||
82 | card->irq = irq; | 82 | card->irq = irq; |
83 | card->cardtype = cardtype; | 83 | card->cardtype = cardtype; |
84 | 84 | ||
85 | retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card); | 85 | retval = request_irq(card->irq, b1_interrupt, IRQF_SHARED, card->name, card); |
86 | if (retval) { | 86 | if (retval) { |
87 | printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n", | 87 | printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n", |
88 | card->irq); | 88 | card->irq); |
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index e7924a545d4..6c3d5f5f1f4 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c | |||
@@ -1172,7 +1172,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev, | |||
1172 | } | 1172 | } |
1173 | c4_reset(card); | 1173 | c4_reset(card); |
1174 | 1174 | ||
1175 | retval = request_irq(card->irq, c4_interrupt, SA_SHIRQ, card->name, card); | 1175 | retval = request_irq(card->irq, c4_interrupt, IRQF_SHARED, card->name, card); |
1176 | if (retval) { | 1176 | if (retval) { |
1177 | printk(KERN_ERR "c4: unable to get IRQ %d.\n",card->irq); | 1177 | printk(KERN_ERR "c4: unable to get IRQ %d.\n",card->irq); |
1178 | retval = -EBUSY; | 1178 | retval = -EBUSY; |
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c index af85511600d..d1e253c94db 100644 --- a/drivers/isdn/hardware/avm/t1pci.c +++ b/drivers/isdn/hardware/avm/t1pci.c | |||
@@ -103,7 +103,7 @@ static int t1pci_add_card(struct capicardparams *p, struct pci_dev *pdev) | |||
103 | } | 103 | } |
104 | b1dma_reset(card); | 104 | b1dma_reset(card); |
105 | 105 | ||
106 | retval = request_irq(card->irq, b1dma_interrupt, SA_SHIRQ, card->name, card); | 106 | retval = request_irq(card->irq, b1dma_interrupt, IRQF_SHARED, card->name, card); |
107 | if (retval) { | 107 | if (retval) { |
108 | printk(KERN_ERR "t1pci: unable to get IRQ %d.\n", card->irq); | 108 | printk(KERN_ERR "t1pci: unable to get IRQ %d.\n", card->irq); |
109 | retval = -EBUSY; | 109 | retval = -EBUSY; |
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index b05e35f7ccb..b7dadba13e8 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
@@ -486,7 +486,7 @@ void __inline__ outpp(void __iomem *addr, word p) | |||
486 | int diva_os_register_irq(void *context, byte irq, const char *name) | 486 | int diva_os_register_irq(void *context, byte irq, const char *name) |
487 | { | 487 | { |
488 | int result = request_irq(irq, diva_os_irq_wrapper, | 488 | int result = request_irq(irq, diva_os_irq_wrapper, |
489 | SA_INTERRUPT | SA_SHIRQ, name, context); | 489 | IRQF_DISABLED | IRQF_SHARED, name, context); |
490 | return (result); | 490 | return (result); |
491 | } | 491 | } |
492 | 492 | ||