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 /sound | |
| 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 'sound')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 7717e01fc07..edaa729126b 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
| @@ -143,7 +143,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
| 143 | link->io.NumPorts1 = 16; | 143 | link->io.NumPorts1 = 16; |
| 144 | 144 | ||
| 145 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; | 145 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; |
| 146 | // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 146 | /* FIXME: This driver should be updated to allow for dynamic IRQ sharing */ |
| 147 | /* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; */ | ||
| 147 | 148 | ||
| 148 | link->irq.Handler = pdacf_interrupt; | 149 | link->irq.Handler = pdacf_interrupt; |
| 149 | link->conf.Attributes = CONF_ENABLE_IRQ; | 150 | link->conf.Attributes = CONF_ENABLE_IRQ; |