diff --git a/[refs] b/[refs]
index 3263780c6865..e8dc6d2b0fc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b32425ac93370e1ba5556110e662f896b2e143b3
+refs/heads/master: a2c855bbd76e7044c54a9d84ae46f6eead1b8f89
diff --git a/trunk/sound/isa/cs423x/cs4231_lib.c b/trunk/sound/isa/cs423x/cs4231_lib.c
index 05d0d4092ded..eab7eb59b5f7 100644
--- a/trunk/sound/isa/cs423x/cs4231_lib.c
+++ b/trunk/sound/isa/cs423x/cs4231_lib.c
@@ -1306,7 +1306,7 @@ static void snd_cs4231_resume(struct snd_cs4231 *chip)
 {
 	int reg;
 	unsigned long flags;
-	int timeout;
+	/* int timeout; */
 	
 	snd_cs4231_mce_up(chip);
 	spin_lock_irqsave(&chip->reg_lock, flags);