diff options
author | 2011-07-22 08:43:24 +0200 | |
---|---|---|
committer | 2011-07-22 08:43:24 +0200 | |
commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pcmcia/vx/vxpocket.c | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: asihpi - Replace with snd_ctl_boolean_mono_info() (diff) | |
download | linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.xz linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pcmcia/vx/vxpocket.c')
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index d9ef21d8fa73..31777d1ea49f 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -229,7 +229,7 @@ static int vxpocket_config(struct pcmcia_device *link) if (ret) goto failed; - ret = pcmcia_request_exclusive_irq(link, snd_vx_irq_handler); + ret = pcmcia_request_irq(link, snd_vx_irq_handler); if (ret) goto failed; |