diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 21:33:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 21:33:02 +0100 |
| commit | fb1beb29b5c531b12485d7c32174a77120590481 (patch) | |
| tree | cb7d1d9733d351ae0ec7acda4851b27acd10abca /sound | |
| parent | Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | pcmcia: CodingStyle fixes (diff) | |
| download | linux-fb1beb29b5c531b12485d7c32174a77120590481.tar.xz linux-fb1beb29b5c531b12485d7c32174a77120590481.zip | |
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 7717e01fc071..edaa729126bb 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) link->io.NumPorts1 = 16; link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; - // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; + /* FIXME: This driver should be updated to allow for dynamic IRQ sharing */ + /* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; */ link->irq.Handler = pdacf_interrupt; link->conf.Attributes = CONF_ENABLE_IRQ; |