diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
| commit | 08229de4b42816079ed5d15f0689fcd0af946d5e (patch) | |
| tree | 7126dc7b220fbbce745cb5d9a8864e9690587da4 /sound/soc/Makefile | |
| parent | fbb474dedab871c7382858c374acd287dad4ab38 (diff) | |
| parent | 2a708137fd7d3e0928f27157aaed8aba404b11c9 (diff) | |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 8120b52a4686..0c5eac01bf2e 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o | 1 | snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o |
| 2 | 2 | ||
| 3 | obj-$(CONFIG_SND_SOC) += snd-soc-core.o | 3 | obj-$(CONFIG_SND_SOC) += snd-soc-core.o |
| 4 | obj-$(CONFIG_SND_SOC) += codecs/ | 4 | obj-$(CONFIG_SND_SOC) += codecs/ |
| @@ -7,8 +7,10 @@ obj-$(CONFIG_SND_SOC) += au1x/ | |||
| 7 | obj-$(CONFIG_SND_SOC) += blackfin/ | 7 | obj-$(CONFIG_SND_SOC) += blackfin/ |
| 8 | obj-$(CONFIG_SND_SOC) += davinci/ | 8 | obj-$(CONFIG_SND_SOC) += davinci/ |
| 9 | obj-$(CONFIG_SND_SOC) += fsl/ | 9 | obj-$(CONFIG_SND_SOC) += fsl/ |
| 10 | obj-$(CONFIG_SND_SOC) += imx/ | ||
| 10 | obj-$(CONFIG_SND_SOC) += omap/ | 11 | obj-$(CONFIG_SND_SOC) += omap/ |
| 11 | obj-$(CONFIG_SND_SOC) += pxa/ | 12 | obj-$(CONFIG_SND_SOC) += pxa/ |
| 12 | obj-$(CONFIG_SND_SOC) += s3c24xx/ | 13 | obj-$(CONFIG_SND_SOC) += s3c24xx/ |
| 14 | obj-$(CONFIG_SND_SOC) += s6000/ | ||
| 13 | obj-$(CONFIG_SND_SOC) += sh/ | 15 | obj-$(CONFIG_SND_SOC) += sh/ |
| 14 | obj-$(CONFIG_SND_SOC) += imx/ | 16 | obj-$(CONFIG_SND_SOC) += txx9/ |