diff options
author | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
---|---|---|
committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /sound/mips/sgio2audio.c | |
parent | TOMOYO: Add recursive directory matching operator support. (diff) | |
parent | Linux 2.6.32 (diff) | |
download | linux-dev-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz linux-dev-c84d6efd363a3948eb32ec40d46bab6338580454.zip |
Merge branch 'master' into next
Diffstat (limited to 'sound/mips/sgio2audio.c')
-rw-r--r-- | sound/mips/sgio2audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index e497525bc11b..8691f4cf6191 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -973,7 +973,7 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev) return 0; } -static int __exit snd_sgio2audio_remove(struct platform_device *pdev) +static int __devexit snd_sgio2audio_remove(struct platform_device *pdev) { struct snd_card *card = platform_get_drvdata(pdev); |