diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
| commit | 1cad23c5f471d695bed1e3907e30caee3c2a3056 (patch) | |
| tree | 34e035df5db9b327aeae36eff9d0645a915e3177 /drivers/sound/Makefile | |
| parent | 5dd73bc0a40a4b318195eab871a1f535aad6b43b (diff) | |
| parent | 00b132bf34c5be86a108ac7fe8231ad9e97f6de4 (diff) | |
| download | u-boot-fsl-qoriq-1cad23c5f471d695bed1e3907e30caee3c2a3056.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm into master
Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/sound/Makefile')
| -rw-r--r-- | drivers/sound/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 6d25292..981ed61 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -6,6 +6,8 @@ # obj-$(CONFIG_SOUND) += sound.o -obj-$(CONFIG_I2S) += samsung-i2s.o +obj-$(CONFIG_I2S) += sound-i2s.o +obj-$(CONFIG_I2S_SAMSUNG) += samsung-i2s.o +obj-$(CONFIG_SOUND_SANDBOX) += sandbox.o obj-$(CONFIG_SOUND_WM8994) += wm8994.o obj-$(CONFIG_SOUND_MAX98095) += max98095.o |