diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 09:51:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 09:51:20 -0800 |
| commit | 724339d76d9407cd1a8ad32a9c1fdf64840cc51b (patch) | |
| tree | 21461971804ffaa22cf4defdba965474da705463 /sound/isa/gus/gusextreme.c | |
| parent | 414f827c46973ba39320cfb43feb55a0eeb9b4e8 (diff) | |
| parent | ccf2c2229d4473cc1a334200c1b60ab6070adabe (diff) | |
| download | lwn-724339d76d9407cd1a8ad32a9c1fdf64840cc51b.tar.gz lwn-724339d76d9407cd1a8ad32a9c1fdf64840cc51b.zip | |
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/gus/gusextreme.c')
| -rw-r--r-- | sound/isa/gus/gusextreme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index 532c56e35ca4..4f55fc3e66c1 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c @@ -92,7 +92,7 @@ static struct platform_device *devices[SNDRV_CARDS]; #define PFX "gusextreme: " -static int __init snd_gusextreme_detect(int dev, +static int __devinit snd_gusextreme_detect(int dev, struct snd_card *card, struct snd_gus_card * gus, struct snd_es1688 *es1688) @@ -142,12 +142,12 @@ static int __init snd_gusextreme_detect(int dev, return 0; } -static void __init snd_gusextreme_init(int dev, struct snd_gus_card * gus) +static void __devinit snd_gusextreme_init(int dev, struct snd_gus_card * gus) { gus->joystick_dac = joystick_dac[dev]; } -static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) +static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip) { struct snd_card *card = chip->card; struct snd_ctl_elem_id id1, id2; @@ -169,7 +169,7 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) return 0; } -static int __init snd_gusextreme_probe(struct platform_device *pdev) +static int __devinit snd_gusextreme_probe(struct platform_device *pdev) { int dev = pdev->id; static int possible_ess_irqs[] = {5, 9, 10, 7, -1}; @@ -321,7 +321,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev) return err; } -static int snd_gusextreme_remove(struct platform_device *devptr) +static int __devexit snd_gusextreme_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -332,7 +332,7 @@ static int snd_gusextreme_remove(struct platform_device *devptr) static struct platform_driver snd_gusextreme_driver = { .probe = snd_gusextreme_probe, - .remove = snd_gusextreme_remove, + .remove = __devexit_p(snd_gusextreme_remove), /* FIXME: suspend/resume */ .driver = { .name = GUSEXTREME_DRIVER |