From: Alan Tull Date: Fri, 3 Feb 2012 10:16:29 +0000 (-0600) Subject: ENGR00173810 clean up rej file X-Git-Tag: v3.0.35-fsl~1563 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9e164b747174ceaf83b2f2768e0e6c087b41f5f1;p=karo-tx-linux.git ENGR00173810 clean up rej file Makefile.rej got committed from doing cherry-pick for kernel upgrade from 2.6.38 to 3.0.15 Signed-off-by: Alan Tull --- diff --git a/sound/soc/imx/Makefile.rej b/sound/soc/imx/Makefile.rej deleted file mode 100644 index 7ff4796ff0bb..000000000000 --- a/sound/soc/imx/Makefile.rej +++ /dev/null @@ -1,15 +0,0 @@ ---- sound/soc/imx/Makefile -+++ sound/soc/imx/Makefile -@@ -14,10 +14,12 @@ - snd-soc-phycore-ac97-objs := phycore-ac97.o - snd-soc-wm1133-ev1-objs := wm1133-ev1.o - snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o -+snd-soc-imx-cs42888-objs := imx-cs42888.o - snd-soc-imx-spdif-objs := imx-spdif.o - - obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o - obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o - obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o - obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o -+obj-$(CONFIG_SND_SOC_IMX_CS42888) += snd-soc-imx-cs42888.o - obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o