diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
commit | c8b201ff867e64b6233d069563081775269f4499 (patch) | |
tree | 35d363e6cb565fd7285480dc877a2da79eafb9a7 /drivers/net/wireless/hostap/hostap_cs.c | |
parent | 436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff) | |
parent | 249b405cf8145da8a74b70544ae1079d244bdb00 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_cs.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 63374027735..ad8eab4a639 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -666,7 +666,8 @@ static int prism2_config(struct pcmcia_device *link) * irq structure is initialized. */ if (link->conf.Attributes & CONF_ENABLE_IRQ) { - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | + IRQ_HANDLE_PRESENT; link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = prism2_interrupt; link->irq.Instance = dev; |