diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:52:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:52:53 -0400 |
| commit | c732acd96085347027b11961463a243c568d9aab (patch) | |
| tree | 5ce568eb6a31a39dfa5c5af4e10e6270383a07a2 /drivers/char | |
| parent | 1b2d3d94ec878c3529153061cd8cceb876e01a3e (diff) | |
| parent | 5cb02ff3489d710c73b4a21bb804feedeacce116 (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:
fdomain_cs: Sort out modules with duplicate description
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 9a626e50b793..4d64a02612a4 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
| @@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
| 554 | /* Initialize the struct pcmcia_device structure */ | 554 | /* Initialize the struct pcmcia_device structure */ |
| 555 | 555 | ||
| 556 | /* Interrupt setup */ | 556 | /* Interrupt setup */ |
| 557 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 557 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
| 558 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 558 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
| 559 | link->irq.Handler = NULL; | 559 | link->irq.Handler = NULL; |
| 560 | 560 | ||