From e95fd51520f66e41bd8346f9017721cee054d22f Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 17 May 2006 17:17:43 +0200
Subject: [PATCH] --- yaml --- r: 28511 b: refs/heads/master c:
 474167d646cb2147b9fcd7bacf5cdf8177ed43c4 h: refs/heads/master i:   28509:
 84f35c691c63cd884b65c34d05d85311ba9ab5a1   28507:
 be851367e86e03467f3af2a69f6cbed6accb0136   28503:
 796173557b18b52a0413a77653a1d3cb3f8fb817   28495:
 3cae03debe970cc94ff463497aab61828be405ea   28479:
 d54bc10195ef71322115afaf16978291f5e8cb73 v: v3

---
 [refs]                              | 2 +-
 trunk/sound/pci/hda/patch_realtek.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea94c7de8357..708fad52022a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6581f4e74d8541dd7d579f64e94822622cbb1654
+refs/heads/master: 474167d646cb2147b9fcd7bacf5cdf8177ed43c4
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
index 0fc2f77dce2c..ceb103b93b08 100644
--- a/trunk/sound/pci/hda/patch_realtek.c
+++ b/trunk/sound/pci/hda/patch_realtek.c
@@ -3106,6 +3106,7 @@ static struct hda_verb alc260_init_verbs[] = {
 	{ }
 };
 
+#if 0 /* should be identical with alc260_init_verbs? */
 static struct hda_verb alc260_hp_init_verbs[] = {
 	/* Headphone and output */
 	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
@@ -3152,6 +3153,7 @@ static struct hda_verb alc260_hp_init_verbs[] = {
 	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
 	{ }
 };
+#endif
 
 static struct hda_verb alc260_hp_3013_init_verbs[] = {
 	/* Line out and output */
@@ -3867,7 +3869,7 @@ static struct alc_config_preset alc260_presets[] = {
 		.mixers = { alc260_base_output_mixer,
 			    alc260_input_mixer,
 			    alc260_capture_alt_mixer },
-		.init_verbs = { alc260_hp_init_verbs },
+		.init_verbs = { alc260_init_verbs },
 		.num_dacs = ARRAY_SIZE(alc260_dac_nids),
 		.dac_nids = alc260_dac_nids,
 		.num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),