Merge commit 'linus/master' into x86/urgent

[mv-sheeva.git] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 49c998186592906a74a07df8d5ccbe59281f5726..dbca7c909a31ea305fe5fa543c6ca9c930fee794 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -353,7 +353,7 @@ static struct sound_unit *chains[SOUND_STEP];
  *      @dev: device pointer
  *
  *     Allocate a special sound device by minor number from the sound
- *     subsystem. The allocated number is returned on succes. On failure
+ *     subsystem. The allocated number is returned on success. On failure
  *     a negative error code is returned.
  */