From: Andre Noll <maan@systemlinux.org>
Date: Thu, 3 Sep 2009 16:49:31 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~30^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=dd462c7e1b61864d6da01a877ced78dab72e2244;hp=8970261c6574f5a46941308ac68a17dc01bbd11f

Merge branch 'master' into next
---

diff --git a/fade.c b/fade.c
index 44904ac5..f95ef4c8 100644
--- a/fade.c
+++ b/fade.c
@@ -107,7 +107,7 @@ static int open_and_set_mixer_channel(int volume)
 
 static void fixup_mixer_channel_arg(void)
 {
-	int val;
+	int val = SOUND_MIXER_VOLUME; /* STFU, gcc */
 
 	switch (conf.mixer_channel_arg) {
 		case mixer_channel_arg_volume: val = SOUND_MIXER_VOLUME; break;