diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
| commit | fef3d2453378a4bbd73c72d4764ea1334c24cb18 (patch) | |
| tree | 49da1daf4c7d5cbce4010b7ef0c9094d46d52838 /sound/soc/Makefile | |
| parent | 79650543698457406d093c534ae17da2e48f6cd0 (diff) | |
| parent | 0472378e1e80bfc3f915f5b46935c87216111294 (diff) | |
Merge topic branch 'audio' into integration-linux-ux500-3.3
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 9ea8ac827ad..c5d3966cf03 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -22,3 +22,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/ |