***************
*** 8339,8399 ****
  	{ }
  };
  
- /*
-  * Toshiba pin configuration:
-  * front = 0x14, mic = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
-  */
- static struct hda_verb alc861vd_toshiba_init_verbs[] = {
- 	/*
- 	 * Set pin mode and muting
- 	 */
- 	/* set front pin widgets 0x14 for output */
- 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
- 	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
- 	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
- 	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
- 
- 	/* Mic (rear) pin: input vref at 80% */
- 	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
- 	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
- 	/* Front Mic pin: input vref at 80% */
- 	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
- 	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
- 	/* Line In pin: input */
- 	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
- 	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
- 	/* Line-2 In: Headphone output (output 0 - 0x0c) */
- 	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
- 	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
- 	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
- 	/* CD pin widget for input */
- 	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
- 
- 	{ }
- };
- /* toggle speaker-output according to the hp-jack state */
- static void alc861vd_toshiba_automute(struct hda_codec *codec)
- {
- 	unsigned int present;
- 
- 	present = snd_hda_codec_read(codec, 0x14, 0,
- 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
- 	snd_hda_codec_write(codec, 0x14,
- 			    0, AC_VERB_SET_EAPD_BTLENABLE,
- 			    present ? 0x02 : 0x00);
- }
- 
- 
- static void alc861vd_toshiba_unsol_event(struct hda_codec *codec,
- 				       unsigned int res)
- {
- 	/* Looks like the unsol event is incompatible with the standard
- 	 * definition.  6bit tag is placed at 26 bit!
- 	 */
- 	if ((res >> 26) == ALC880_HP_EVENT)
- 		alc861_toshiba_automute(codec);
- }
- 
  /* pcm configuration: identiacal with ALC880 */
  #define alc861vd_pcm_analog_playback	alc880_pcm_analog_playback
  #define alc861vd_pcm_analog_capture	alc880_pcm_analog_capture
--- 8317,8322 ----
  	{ }
  };
  
  /* pcm configuration: identiacal with ALC880 */
  #define alc861vd_pcm_analog_playback	alc880_pcm_analog_playback
  #define alc861vd_pcm_analog_capture	alc880_pcm_analog_capture