summaryrefslogtreecommitdiffstats
path: root/sound/arm/pxa2xx-ac97.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:14 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:14 +0100
commit627b79628f56c3deeb17dec1edf6899b49552fa4 (patch)
treedeac8b2cce5d70708fa944a270ee031f069226d8 /sound/arm/pxa2xx-ac97.c
parent29abceb67f8a230da806db4ed73899595bd2ae76 (diff)
parent8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff)
downloadlinux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/arm/pxa2xx-ac97.c')
-rw-r--r--sound/arm/pxa2xx-ac97.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 5d9411839cd7..3a39626a82d6 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -251,18 +251,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
},
};
-static int __init pxa2xx_ac97_init(void)
-{
- return platform_driver_register(&pxa2xx_ac97_driver);
-}
-
-static void __exit pxa2xx_ac97_exit(void)
-{
- platform_driver_unregister(&pxa2xx_ac97_driver);
-}
-
-module_init(pxa2xx_ac97_init);
-module_exit(pxa2xx_ac97_exit);
+module_platform_driver(pxa2xx_ac97_driver);
MODULE_AUTHOR("Nicolas Pitre");
MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");