diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /sound/synth | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'sound/synth')
| -rw-r--r-- | sound/synth/emux/soundfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 63c8f45c0c22..67c91230c197 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
| @@ -374,7 +374,7 @@ sf_zone_new(struct snd_sf_list *sflist, struct snd_soundfont *sf) | |||
| 374 | 374 | ||
| 375 | 375 | ||
| 376 | /* | 376 | /* |
| 377 | * increment sample couter | 377 | * increment sample counter |
| 378 | */ | 378 | */ |
| 379 | static void | 379 | static void |
| 380 | set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf, | 380 | set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf, |