diff --git a/[refs] b/[refs]
index 3528cc08222e..7500f4fbf2d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36dd5c4afff825fca1b6ccde678f51d6933a6850
+refs/heads/master: 6a5f96ce72b9e1a4bf06422df53fa819947d2293
diff --git a/trunk/sound/pci/hda/patch_intelhdmi.c b/trunk/sound/pci/hda/patch_intelhdmi.c
index 650de1b4ea8d..4f25f08d332b 100644
--- a/trunk/sound/pci/hda/patch_intelhdmi.c
+++ b/trunk/sound/pci/hda/patch_intelhdmi.c
@@ -403,11 +403,13 @@ static void hdmi_stop_infoframe_trans(struct hda_codec *codec,
 						AC_DIPXMIT_DISABLE);
 }
 
+#ifdef CONFIG_SND_DEBUG_VERBOSE
 static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)
 {
 	return 1 + snd_hda_codec_read(codec, nid, 0,
 					AC_VERB_GET_CVT_CHAN_COUNT, 0);
 }
+#endif
 
 static void hdmi_set_channel_count(struct hda_codec *codec,
 				   hda_nid_t nid, int chs)