summaryrefslogtreecommitdiff
path: root/sound/mips/sgio2audio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-12 08:59:14 (GMT)
committerTakashi Iwai <tiwai@suse.de>2012-01-12 08:59:14 (GMT)
commit627b79628f56c3deeb17dec1edf6899b49552fa4 (patch)
treedeac8b2cce5d70708fa944a270ee031f069226d8 /sound/mips/sgio2audio.c
parent29abceb67f8a230da806db4ed73899595bd2ae76 (diff)
parent8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff)
downloadlinux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.xz
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/mips/sgio2audio.c')
-rw-r--r--sound/mips/sgio2audio.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 69425d4..ceaa593 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -976,15 +976,4 @@ static struct platform_driver sgio2audio_driver = {
}
};
-static int __init alsa_card_sgio2audio_init(void)
-{
- return platform_driver_register(&sgio2audio_driver);
-}
-
-static void __exit alsa_card_sgio2audio_exit(void)
-{
- platform_driver_unregister(&sgio2audio_driver);
-}
-
-module_init(alsa_card_sgio2audio_init)
-module_exit(alsa_card_sgio2audio_exit)
+module_platform_driver(sgio2audio_driver);