Loading sound/core/Kconfig +3 −0 Original line number Original line Diff line number Diff line Loading @@ -6,6 +6,9 @@ config SND_PCM tristate tristate select SND_TIMER select SND_TIMER config SND_DMAENGINE_PCM tristate config SND_HWDEP config SND_HWDEP tristate tristate Loading sound/core/Makefile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -13,6 +13,8 @@ snd-$(CONFIG_SND_JACK) += jack.o snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o pcm_memory.o snd-pcm-dmaengine-objs := pcm_dmaengine.o snd-page-alloc-y := memalloc.o snd-page-alloc-y := memalloc.o snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o Loading @@ -30,6 +32,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o obj-$(CONFIG_SND_OSSEMUL) += oss/ obj-$(CONFIG_SND_OSSEMUL) += oss/ Loading sound/soc/soc-dmaengine-pcm.c→sound/core/pcm_dmaengine.c +0 −0 File moved. View file sound/soc/Kconfig +1 −4 Original line number Original line Diff line number Diff line Loading @@ -26,12 +26,9 @@ if SND_SOC config SND_SOC_AC97_BUS config SND_SOC_AC97_BUS bool bool config SND_SOC_DMAENGINE_PCM bool config SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_GENERIC_DMAENGINE_PCM bool bool select SND_SOC_DMAENGINE_PCM select SND_DMAENGINE_PCM # All the supported SoCs # All the supported SoCs source "sound/soc/atmel/Kconfig" source "sound/soc/atmel/Kconfig" Loading sound/soc/Makefile +0 −4 Original line number Original line Diff line number Diff line snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o 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-compress.o soc-io.o snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),) snd-soc-core-objs += soc-dmaengine-pcm.o endif ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o snd-soc-core-objs += soc-generic-dmaengine-pcm.o endif endif Loading Loading
sound/core/Kconfig +3 −0 Original line number Original line Diff line number Diff line Loading @@ -6,6 +6,9 @@ config SND_PCM tristate tristate select SND_TIMER select SND_TIMER config SND_DMAENGINE_PCM tristate config SND_HWDEP config SND_HWDEP tristate tristate Loading
sound/core/Makefile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -13,6 +13,8 @@ snd-$(CONFIG_SND_JACK) += jack.o snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o pcm_memory.o snd-pcm-dmaengine-objs := pcm_dmaengine.o snd-page-alloc-y := memalloc.o snd-page-alloc-y := memalloc.o snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o Loading @@ -30,6 +32,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o obj-$(CONFIG_SND_OSSEMUL) += oss/ obj-$(CONFIG_SND_OSSEMUL) += oss/ Loading
sound/soc/Kconfig +1 −4 Original line number Original line Diff line number Diff line Loading @@ -26,12 +26,9 @@ if SND_SOC config SND_SOC_AC97_BUS config SND_SOC_AC97_BUS bool bool config SND_SOC_DMAENGINE_PCM bool config SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_GENERIC_DMAENGINE_PCM bool bool select SND_SOC_DMAENGINE_PCM select SND_DMAENGINE_PCM # All the supported SoCs # All the supported SoCs source "sound/soc/atmel/Kconfig" source "sound/soc/atmel/Kconfig" Loading
sound/soc/Makefile +0 −4 Original line number Original line Diff line number Diff line snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o 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-compress.o soc-io.o snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),) snd-soc-core-objs += soc-dmaengine-pcm.o endif ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o snd-soc-core-objs += soc-generic-dmaengine-pcm.o endif endif Loading
