diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 12:51:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 12:51:20 -0500 |
commit | 724339d76d9407cd1a8ad32a9c1fdf64840cc51b (patch) | |
tree | 21461971804ffaa22cf4defdba965474da705463 /sound/isa/opl3sa2.c | |
parent | 414f827c46973ba39320cfb43feb55a0eeb9b4e8 (diff) | |
parent | ccf2c2229d4473cc1a334200c1b60ab6070adabe (diff) |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.14rc2
[ALSA] Fix a typo in __dev* changes in portman2x4.c
[ALSA] Change AT91 PDC register defines for 2.6.20 kernel
[ALSA] SoC codecs - fix Kconfig - depends -> depends on
[ALSA] Fix __devinit and __devexit issues with sound drivers
[ALSA] hda-codec - Patch for enabling LFE on more Dell laptops
[ALSA] hda-codec - More fixes for Conexant HD Audio support
[ALSA] usb-audio: add PCR-A PCM support
[ALSA] emu10k1: fix typo
[ALSA] usbaudio - remove urb->bandwidth reference
[ALSA] ac97 - Fix silent output problem with Cx20551 codec
[ALSA] hda-codec - Fix Oops with probing sigmatel codec chips
Diffstat (limited to 'sound/isa/opl3sa2.c')
-rw-r--r-- | sound/isa/opl3sa2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 1e30713d2cad..f3db686b1c0c 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
@@ -919,7 +919,7 @@ static int __devinit snd_opl3sa2_nonpnp_probe(struct platform_device *pdev) | |||
919 | return 0; | 919 | return 0; |
920 | } | 920 | } |
921 | 921 | ||
922 | static int snd_opl3sa2_nonpnp_remove(struct platform_device *devptr) | 922 | static int __devexit snd_opl3sa2_nonpnp_remove(struct platform_device *devptr) |
923 | { | 923 | { |
924 | snd_card_free(platform_get_drvdata(devptr)); | 924 | snd_card_free(platform_get_drvdata(devptr)); |
925 | platform_set_drvdata(devptr, NULL); | 925 | platform_set_drvdata(devptr, NULL); |
@@ -942,7 +942,7 @@ static int snd_opl3sa2_nonpnp_resume(struct platform_device *dev) | |||
942 | 942 | ||
943 | static struct platform_driver snd_opl3sa2_nonpnp_driver = { | 943 | static struct platform_driver snd_opl3sa2_nonpnp_driver = { |
944 | .probe = snd_opl3sa2_nonpnp_probe, | 944 | .probe = snd_opl3sa2_nonpnp_probe, |
945 | .remove = snd_opl3sa2_nonpnp_remove, | 945 | .remove = __devexit( snd_opl3sa2_nonpnp_remove), |
946 | #ifdef CONFIG_PM | 946 | #ifdef CONFIG_PM |
947 | .suspend = snd_opl3sa2_nonpnp_suspend, | 947 | .suspend = snd_opl3sa2_nonpnp_suspend, |
948 | .resume = snd_opl3sa2_nonpnp_resume, | 948 | .resume = snd_opl3sa2_nonpnp_resume, |