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/net/pcmcia/fmvj18x_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/net/pcmcia/fmvj18x_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 8ad8384fc1c0..813aca3fc433 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
| @@ -426,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
| 426 | 426 | ||
| 427 | if (link->io.NumPorts2 != 0) { | 427 | if (link->io.NumPorts2 != 0) { |
| 428 | link->irq.Attributes = | 428 | link->irq.Attributes = |
| 429 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 429 | IRQ_TYPE_DYNAMIC_SHARING; |
| 430 | ret = mfc_try_io_port(link); | 430 | ret = mfc_try_io_port(link); |
| 431 | if (ret != 0) goto failed; | 431 | if (ret != 0) goto failed; |
| 432 | } else if (cardtype == UNGERMANN) { | 432 | } else if (cardtype == UNGERMANN) { |