diff options
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/imx/Makefile.rej | 15 |
1 files changed, 0 insertions, 15 deletions
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 |