diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index eb183443eee4..1ed61c5df2c5 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
| @@ -10,11 +10,13 @@ obj-$(CONFIG_SND_SOC) += ep93xx/ | |||
| 10 | obj-$(CONFIG_SND_SOC) += fsl/ | 10 | obj-$(CONFIG_SND_SOC) += fsl/ |
| 11 | obj-$(CONFIG_SND_SOC) += imx/ | 11 | obj-$(CONFIG_SND_SOC) += imx/ |
| 12 | obj-$(CONFIG_SND_SOC) += jz4740/ | 12 | obj-$(CONFIG_SND_SOC) += jz4740/ |
| 13 | obj-$(CONFIG_SND_SOC) += mid-x86/ | ||
| 13 | obj-$(CONFIG_SND_SOC) += nuc900/ | 14 | obj-$(CONFIG_SND_SOC) += nuc900/ |
| 14 | obj-$(CONFIG_SND_SOC) += omap/ | 15 | obj-$(CONFIG_SND_SOC) += omap/ |
| 15 | obj-$(CONFIG_SND_SOC) += kirkwood/ | 16 | obj-$(CONFIG_SND_SOC) += kirkwood/ |
| 16 | obj-$(CONFIG_SND_SOC) += pxa/ | 17 | obj-$(CONFIG_SND_SOC) += pxa/ |
| 17 | obj-$(CONFIG_SND_SOC) += s3c24xx/ | 18 | obj-$(CONFIG_SND_SOC) += samsung/ |
| 18 | obj-$(CONFIG_SND_SOC) += s6000/ | 19 | obj-$(CONFIG_SND_SOC) += s6000/ |
| 19 | obj-$(CONFIG_SND_SOC) += sh/ | 20 | obj-$(CONFIG_SND_SOC) += sh/ |
| 21 | obj-$(CONFIG_SND_SOC) += tegra/ | ||
| 20 | obj-$(CONFIG_SND_SOC) += txx9/ | 22 | obj-$(CONFIG_SND_SOC) += txx9/ |