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 /drivers/net/pcmcia/xirc2ps_cs.c | |
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 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index a2eda28f903e..466fc72698c0 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c @@ -841,7 +841,7 @@ xirc2ps_config(struct pcmcia_device * link) link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Status |= CCSR_AUDIO_ENA; } - link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED ; + link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING; link->io.NumPorts2 = 8; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; if (local->dingo) { |