diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/sound_core.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/sound_core.c')
| -rw-r--r-- | sound/sound_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c index 49c998186592..7c2d677a2df5 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c | |||
| @@ -61,7 +61,7 @@ static void __exit cleanup_soundcore(void) | |||
| 61 | class_destroy(sound_class); | 61 | class_destroy(sound_class); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | module_init(init_soundcore); | 64 | subsys_initcall(init_soundcore); |
| 65 | module_exit(cleanup_soundcore); | 65 | module_exit(cleanup_soundcore); |
| 66 | 66 | ||
| 67 | 67 | ||
| @@ -353,7 +353,7 @@ static struct sound_unit *chains[SOUND_STEP]; | |||
| 353 | * @dev: device pointer | 353 | * @dev: device pointer |
| 354 | * | 354 | * |
| 355 | * Allocate a special sound device by minor number from the sound | 355 | * Allocate a special sound device by minor number from the sound |
| 356 | * subsystem. The allocated number is returned on succes. On failure | 356 | * subsystem. The allocated number is returned on success. On failure |
| 357 | * a negative error code is returned. | 357 | * a negative error code is returned. |
| 358 | */ | 358 | */ |
| 359 | 359 | ||