diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-20 12:24:51 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 08:31:51 -0400 |
commit | 49d7ad9d8a5546d96061f08de1fb30241140849c (patch) | |
tree | 79149033717b722367493c3e5b5e226a807aabc3 | |
parent | 7d83d2138390d499fccfde5c4975c66503d80704 (diff) |
ASoC: Add build infrastructure for WL1273
The Makefile and Kconfig updates for WL1273 appear to have been mising
from the patch posted, add them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | sound/soc/codecs/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/codecs/Makefile | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index a3cfc184ee50..155c1276d1a1 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
@@ -41,6 +41,7 @@ config SND_SOC_ALL_CODECS | |||
41 | select SND_SOC_TWL6040 if TWL4030_CORE | 41 | select SND_SOC_TWL6040 if TWL4030_CORE |
42 | select SND_SOC_UDA134X | 42 | select SND_SOC_UDA134X |
43 | select SND_SOC_UDA1380 if I2C | 43 | select SND_SOC_UDA1380 if I2C |
44 | select SND_SOC_WL1273 if WL1273_CORE | ||
44 | select SND_SOC_WM2000 if I2C | 45 | select SND_SOC_WM2000 if I2C |
45 | select SND_SOC_WM8350 if MFD_WM8350 | 46 | select SND_SOC_WM8350 if MFD_WM8350 |
46 | select SND_SOC_WM8400 if MFD_WM8400 | 47 | select SND_SOC_WM8400 if MFD_WM8400 |
@@ -193,6 +194,9 @@ config SND_SOC_UDA134X | |||
193 | config SND_SOC_UDA1380 | 194 | config SND_SOC_UDA1380 |
194 | tristate | 195 | tristate |
195 | 196 | ||
197 | config SND_SOC_WL1273 | ||
198 | tristate | ||
199 | |||
196 | config SND_SOC_WM8350 | 200 | config SND_SOC_WM8350 |
197 | tristate | 201 | tristate |
198 | 202 | ||
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index b9c43582c5bd..10d468e4a1ed 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -27,6 +27,7 @@ snd-soc-twl4030-objs := twl4030.o | |||
27 | snd-soc-twl6040-objs := twl6040.o | 27 | snd-soc-twl6040-objs := twl6040.o |
28 | snd-soc-uda134x-objs := uda134x.o | 28 | snd-soc-uda134x-objs := uda134x.o |
29 | snd-soc-uda1380-objs := uda1380.o | 29 | snd-soc-uda1380-objs := uda1380.o |
30 | snd-soc-wl1273-objs := wl1273.o | ||
30 | snd-soc-wm8350-objs := wm8350.o | 31 | snd-soc-wm8350-objs := wm8350.o |
31 | snd-soc-wm8400-objs := wm8400.o | 32 | snd-soc-wm8400-objs := wm8400.o |
32 | snd-soc-wm8510-objs := wm8510.o | 33 | snd-soc-wm8510-objs := wm8510.o |
@@ -98,6 +99,7 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o | |||
98 | obj-$(CONFIG_SND_SOC_TWL6040) += snd-soc-twl6040.o | 99 | obj-$(CONFIG_SND_SOC_TWL6040) += snd-soc-twl6040.o |
99 | obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o | 100 | obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o |
100 | obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o | 101 | obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o |
102 | obj-$(CONFIG_SND_SOC_WL1273) += snd-soc-wl1273.o | ||
101 | obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o | 103 | obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o |
102 | obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o | 104 | obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o |
103 | obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o | 105 | obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o |