diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-02 09:05:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-02 09:31:11 -0400 |
commit | 8aafc43556cadc24dd9cf8563c66ab68c8d05748 (patch) | |
tree | fed3e9aca4a5280789d54f2cf1e88cc66eb5fbad /sound/soc/codecs/Makefile | |
parent | 00ae3b8691e6486895d92de05d7d1d3a70bb5077 (diff) |
ASoC: Sort LM4857 with the CODECs in the Makefile
Having a separate list for amps is a little confusing now the official
driver model for them is the same as for other CODECs so let's sort them
into the CODEC list, but only do this for those that are actual CODEC
drivers so it's easier to remember which ones need updating.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r-- | sound/soc/codecs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index a2c7842e357b..d7a5ff30a3a5 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -22,6 +22,7 @@ snd-soc-da7210-objs := da7210.o | |||
22 | snd-soc-dfbmcs320-objs := dfbmcs320.o | 22 | snd-soc-dfbmcs320-objs := dfbmcs320.o |
23 | snd-soc-dmic-objs := dmic.o | 23 | snd-soc-dmic-objs := dmic.o |
24 | snd-soc-l3-objs := l3.o | 24 | snd-soc-l3-objs := l3.o |
25 | snd-soc-lm4857-objs := lm4857.o | ||
25 | snd-soc-max98088-objs := max98088.o | 26 | snd-soc-max98088-objs := max98088.o |
26 | snd-soc-max98095-objs := max98095.o | 27 | snd-soc-max98095-objs := max98095.o |
27 | snd-soc-max9850-objs := max9850.o | 28 | snd-soc-max9850-objs := max9850.o |
@@ -91,7 +92,6 @@ snd-soc-wm-hubs-objs := wm_hubs.o | |||
91 | snd-soc-jz4740-codec-objs := jz4740.o | 92 | snd-soc-jz4740-codec-objs := jz4740.o |
92 | 93 | ||
93 | # Amp | 94 | # Amp |
94 | snd-soc-lm4857-objs := lm4857.o | ||
95 | snd-soc-max9877-objs := max9877.o | 95 | snd-soc-max9877-objs := max9877.o |
96 | snd-soc-tpa6130a2-objs := tpa6130a2.o | 96 | snd-soc-tpa6130a2-objs := tpa6130a2.o |
97 | snd-soc-wm2000-objs := wm2000.o | 97 | snd-soc-wm2000-objs := wm2000.o |
@@ -122,6 +122,7 @@ obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o | |||
122 | obj-$(CONFIG_SND_SOC_DFBMCS320) += snd-soc-dfbmcs320.o | 122 | obj-$(CONFIG_SND_SOC_DFBMCS320) += snd-soc-dfbmcs320.o |
123 | obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o | 123 | obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o |
124 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o | 124 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o |
125 | obj-$(CONFIG_SND_SOC_LM4857) += snd-soc-lm4857.o | ||
125 | obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o | 126 | obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o |
126 | obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o | 127 | obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o |
127 | obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o | 128 | obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o |
@@ -190,7 +191,6 @@ obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o | |||
190 | obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o | 191 | obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o |
191 | 192 | ||
192 | # Amp | 193 | # Amp |
193 | obj-$(CONFIG_SND_SOC_LM4857) += snd-soc-lm4857.o | ||
194 | obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o | 194 | obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o |
195 | obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o | 195 | obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o |
196 | obj-$(CONFIG_SND_SOC_WM2000) += snd-soc-wm2000.o | 196 | obj-$(CONFIG_SND_SOC_WM2000) += snd-soc-wm2000.o |