diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-12 09:40:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-12 09:40:28 -0400 |
| commit | cf7af01aa77ec1b17687f5328ce0a598709efd59 (patch) | |
| tree | 4cc46339721366c7498dacf5ebac01906be273e7 /sound/soc/fsl/Makefile | |
| parent | 6f341d14811550d863ba804ce6ec7757a7145081 (diff) | |
| parent | 5dcba5d6741d4533e0ef696507f93f2a4c738efb (diff) | |
Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
Diffstat (limited to 'sound/soc/fsl/Makefile')
| -rw-r--r-- | sound/soc/fsl/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index a83a73967ec6..7e472a53fcd3 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # Simple machine driver that extracts configuration from the OF device tree | ||
| 2 | obj-$(CONFIG_SND_SOC_OF_SIMPLE) += soc-of-simple.o | ||
| 3 | |||
| 4 | # MPC8610 HPCD Machine Support | 1 | # MPC8610 HPCD Machine Support |
| 5 | snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o | 2 | snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o |
| 6 | obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o | 3 | obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o |