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/hisax/avma1_cs.c | |
| 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/hisax/avma1_cs.c')
| -rw-r--r-- | drivers/isdn/hisax/avma1_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index f9bdff39cf4a..e5deb15cf40c 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
| @@ -120,8 +120,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) | |||
| 120 | p_dev->io.IOAddrLines = 5; | 120 | p_dev->io.IOAddrLines = 5; |
| 121 | 121 | ||
| 122 | /* Interrupt setup */ | 122 | /* Interrupt setup */ |
| 123 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 123 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
| 124 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | ||
| 125 | 124 | ||
| 126 | /* General socket configuration */ | 125 | /* General socket configuration */ |
| 127 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 126 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |