diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (patch) | |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 /sound/core/sound.c | |
| parent | 83f0d53993b2967e54186468b0fc4321447f68f1 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| download | linux-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.tar.gz | |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/core/sound.c')
| -rw-r--r-- | sound/core/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index 7872a02f6ca9..563d1967a0ad 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); |