From: Andrew Morton Signed-off-by: Andrew Morton --- sound/pci/hda/patch_sigmatel.c | 25 ------------------------- sound/soc/Kconfig | 6 ------ 2 files changed, 31 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 @@ -530,17 +530,7 @@ static unsigned int macbook_pro_v1_pin_c 0x02a19320, 0x400000fb }; -<<<<<<< HEAD/sound/pci/hda/patch_sigmatel.c -static unsigned int macbook_pro_v1_pin_configs[10] = { - 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010, - 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e, - 0x02a19320, 0x400000fb -}; - static unsigned int macbook_pro_v2_pin_configs[10] = { -======= -static unsigned int macbook_pro_v2_pin_configs[10] = { ->>>>>>> /sound/pci/hda/patch_sigmatel.c 0x0221401f, 0x90a70120, 0x01813024, 0x01014010, 0x400000fd, 0x01016011, 0x1345e240, 0x13c5e22e, 0x400000fc, 0x400000fb, @@ -550,17 +540,10 @@ static unsigned int *stac922x_brd_tbl[ST [STAC_D945_REF] = ref922x_pin_configs, [STAC_D945GTP3] = d945gtp3_pin_configs, [STAC_D945GTP5] = d945gtp5_pin_configs, -<<<<<<< HEAD/sound/pci/hda/patch_sigmatel.c - [STAC_MACMINI] = d945gtp5_pin_configs, - [STAC_MACBOOK] = macbook_pin_configs, - [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs, - [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs, -======= [STAC_MACMINI] = macbook_pro_v1_pin_configs, [STAC_MACBOOK] = macbook_pro_v1_pin_configs, [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs, [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs, ->>>>>>> /sound/pci/hda/patch_sigmatel.c }; static const char *stac922x_models[STAC_922X_MODELS] = { @@ -1928,13 +1911,6 @@ static int patch_stac922x(struct hda_cod */ printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n", codec->subsystem_id); switch (codec->subsystem_id) { -<<<<<<< HEAD/sound/pci/hda/patch_sigmatel.c - case 0x106b0200: /* MacBook Pro first generation */ - spec->board_config = STAC_MACBOOK_PRO_V1; - break; - case 0x106b1e00: /* MacBook Pro second generation */ - spec->board_config = STAC_MACBOOK_PRO_V2; -======= case 0x106b0a00: /* MacBook First generatoin */ spec->board_config = STAC_MACBOOK; break; @@ -1943,7 +1919,6 @@ static int patch_stac922x(struct hda_cod break; case 0x106b1e00: /* MacBook Pro second generation */ spec->board_config = STAC_MACBOOK_PRO_V2; ->>>>>>> /sound/pci/hda/patch_sigmatel.c break; } } diff -puN sound/soc/Kconfig~git-alsa-fixup sound/soc/Kconfig --- a/sound/soc/Kconfig~git-alsa-fixup +++ a/sound/soc/Kconfig @@ -9,15 +9,9 @@ config SND_SOC_AC97_BUS bool config SND_SOC -<<<<<<< HEAD/sound/soc/Kconfig - tristate "SoC audio support" - depends on SND - select SND_PCM -======= tristate "ALSA for SoC audio support" depends on SND select SND_PCM ->>>>>>> /sound/soc/Kconfig ---help--- If you want ASoC support, you should say Y here and also to the _