diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 13:58:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 13:58:23 +0000 |
| commit | 3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch) | |
| tree | 708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/codecs/Makefile | |
| parent | a193436c5d52e8398af22462beaa03407fa89b2e (diff) | |
| parent | 7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff) | |
| download | kernel_samsung_espresso10-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip kernel_samsung_espresso10-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.gz kernel_samsung_espresso10-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.bz2 | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/Makefile')
| -rw-r--r-- | sound/soc/codecs/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 76304d4..333910a 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -14,6 +14,7 @@ snd-soc-cs42l51-objs := cs42l51.o snd-soc-cs4270-objs := cs4270.o snd-soc-cx20442-objs := cx20442.o snd-soc-da7210-objs := da7210.o +snd-soc-dmic-objs := dmic.o snd-soc-l3-objs := l3.o snd-soc-max98088-objs := max98088.o snd-soc-pcm3008-objs := pcm3008.o @@ -93,6 +94,7 @@ obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o +obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o |