diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:33:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:33:02 -0500 |
| commit | fb1beb29b5c531b12485d7c32174a77120590481 (patch) | |
| tree | cb7d1d9733d351ae0ec7acda4851b27acd10abca /drivers/isdn/hardware | |
| parent | 478e4e9d7a618379676b17e64583ff3622f2fec5 (diff) | |
| parent | 9fea84f46a821aa1ff2d034ffda8ad33bff48015 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: CodingStyle fixes
pcmcia: remove unused IRQ_FIRST_SHARED
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/avm/avm_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 5a6ae646a636..94b796d84053 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
| @@ -108,8 +108,7 @@ static int avmcs_probe(struct pcmcia_device *p_dev) | |||
| 108 | p_dev->io.NumPorts2 = 0; | 108 | p_dev->io.NumPorts2 = 0; |
| 109 | 109 | ||
| 110 | /* Interrupt setup */ | 110 | /* Interrupt setup */ |
| 111 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 111 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
| 112 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | ||
| 113 | 112 | ||
| 114 | /* General socket configuration */ | 113 | /* General socket configuration */ |
| 115 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 114 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |