aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>2010-01-12 20:20:39 -0200
committerTakashi Iwai <tiwai@suse.de>2010-01-14 21:21:47 +0100
commitc181a13a41ef32c9037393f4b42b780e1a36eb91 (patch)
tree384652a93f64c254757c5cddbefe92fa10ce1a69 /sound
parent7284ce6c9f6153d1777df5f310c959724d1bd446 (diff)
downloadmrst-s0i3-test-c181a13a41ef32c9037393f4b42b780e1a36eb91.tar.gz
mrst-s0i3-test-c181a13a41ef32c9037393f4b42b780e1a36eb91.tar.xz
mrst-s0i3-test-c181a13a41ef32c9037393f4b42b780e1a36eb91.zip
ALSA: use subsys_initcall for sound core instead of module_init
This is needed for built-in drivers which are built before the sound directory, like thinkpad_acpi. Otherwise, registering a card fails. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/sound.c4
-rw-r--r--sound/sound_core.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 7872a02f6ca..563d1967a0a 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -468,5 +468,5 @@ static void __exit alsa_sound_exit(void)
unregister_chrdev(major, "alsa");
}
-module_init(alsa_sound_init)
-module_exit(alsa_sound_exit)
+subsys_initcall(alsa_sound_init);
+module_exit(alsa_sound_exit);
diff --git a/sound/sound_core.c b/sound/sound_core.c
index dbca7c909a3..7c2d677a2df 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -61,7 +61,7 @@ static void __exit cleanup_soundcore(void)
class_destroy(sound_class);
}
-module_init(init_soundcore);
+subsys_initcall(init_soundcore);
module_exit(cleanup_soundcore);