diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:32 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:32 +0800 |
| commit | 5a5c0904d7eab2f2ce51419fbcd4e63247413d16 (patch) | |
| tree | da0807c42b20db8689b902e6378099523484c7f2 /sound/soc/Makefile | |
| parent | 1aba37fc5314da4ea3c3eb759b9e4c52c4404136 (diff) | |
| parent | 16be2ec95a152e65a7522f23a4c9d019325cc41d (diff) | |
Merge topic branch 'audio' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 2feaf376e94..f5fe62111b8 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -25,3 +25,4 @@ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += tegra/ obj-$(CONFIG_SND_SOC) += txx9/ +obj-$(CONFIG_SND_SOC) += ux500/ |