lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 236/241] ASoC: dmaengine: Correct Makefile when sound is built as module
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Peter Ujfalusi <peter.ujfalusi@ti.com>

    commit 961a7aeafab477f63d9eef26afde9cbb8badcd0f upstream.

    soc-dmaengine-pcm library need to be part of the snd-soc-core in order to
    be able to compile ASoC as modules when dmaengine is enabled on the platform.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    sound/soc/Makefile | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/Makefile b/sound/soc/Makefile
    index 70990f4..7fda792 100644
    --- a/sound/soc/Makefile
    +++ b/sound/soc/Makefile
    @@ -1,8 +1,9 @@
    snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
    snd-soc-core-objs += soc-pcm.o soc-io.o

    -snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
    -obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
    +ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
    +snd-soc-core-objs += soc-dmaengine-pcm.o
    +endif

    obj-$(CONFIG_SND_SOC) += snd-soc-core.o
    obj-$(CONFIG_SND_SOC) += codecs/
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 16:01    [W:2.757 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site