From: Andrew Morton Signed-off-by: Andrew Morton --- sound/pci/hda/patch_sigmatel.c | 11 ----------- 1 file changed, 11 deletions(-) diff -puN sound/pci/hda/patch_sigmatel.c~git-alsa-fixup sound/pci/hda/patch_sigmatel.c --- a/sound/pci/hda/patch_sigmatel.c~git-alsa-fixup +++ a/sound/pci/hda/patch_sigmatel.c @@ -121,10 +121,7 @@ struct sigmatel_spec { unsigned int mic_switch: 1; unsigned int alt_switch: 1; unsigned int hp_detect: 1; -<<<<<<< HEAD:sound/pci/hda/patch_sigmatel.c unsigned int gpio_mute: 1; -======= ->>>>>>> FETCH_HEAD:sound/pci/hda/patch_sigmatel.c unsigned int gpio_mask, gpio_data; unsigned char aloopback_mask; @@ -760,11 +757,7 @@ static struct snd_kcontrol_new stac925x_ static struct snd_kcontrol_new stac9205_mixer[] = { STAC_INPUT_SOURCE(2), -<<<<<<< HEAD:sound/pci/hda/patch_sigmatel.c - STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0), -======= STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1), ->>>>>>> FETCH_HEAD:sound/pci/hda/patch_sigmatel.c HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1b, 0x0, HDA_INPUT), HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1d, 0x0, HDA_OUTPUT), @@ -793,11 +786,7 @@ static struct snd_kcontrol_new stac922x_ static struct snd_kcontrol_new stac927x_mixer[] = { STAC_INPUT_SOURCE(3), -<<<<<<< HEAD:sound/pci/hda/patch_sigmatel.c - STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB), -======= STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1), ->>>>>>> FETCH_HEAD:sound/pci/hda/patch_sigmatel.c HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x18, 0x0, HDA_INPUT), HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1b, 0x0, HDA_OUTPUT), _