make sound support monolithic

It is really hard to get it right, with the dependencies
in this case. So if a user wants sound support, he will just get
it included in the kernel. If not, just do not activate it.

1 files changed, 0 insertions, 128 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index ec983e80b..4d1b66b5b 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1148,134 +1148,6 @@ $(eval $(call KMOD_template,UDF_FS,udf-fs,\
 # Multimedia
 #
 
-$(eval $(call KMOD_template,DMA_BCM2708,dma-bcm2708,\
-	$(MODULES_DIR)/kernel/drivers/dma/virt-dma \
-	$(MODULES_DIR)/kernel/drivers/dma/bcm2708-dmaengine \
-,25))
-
-$(eval $(call KMOD_template,SOUND,sound,\
-	$(MODULES_DIR)/kernel/sound/soundcore \
-,30))
-
-$(eval $(call KMOD_template,SND,snd,\
-	$(MODULES_DIR)/kernel/sound/core/snd \
-	$(MODULES_DIR)/kernel/sound/core/snd-timer \
-,35))
-
-ifeq ($(KERNEL_BASE),3)
-ifeq ($(KERNEL_MAJ),10)
-$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
-	$(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
-	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
-,40))
-else
-$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
-	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
-,40))
-endif
-endif
-
-$(eval $(call KMOD_template,SND_DMAENGINE_PCM,snd-dmaengine-pcm,\
-	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
-,45))
-
-$(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
-	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
-	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
-,45))
-
-$(eval $(call KMOD_template,SND_SOC,snd-soc,\
-	$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
-,50))
-
-$(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\
-	$(MODULES_DIR)/kernel/sound/ac97_bus \
-	$(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \
-,55))
-
-$(eval $(call KMOD_template,SND_SOC_WM8804,snd-soc-wm8804,\
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
-,55))
-
-$(eval $(call KMOD_template,SND_SOC_PCM5102A,snd-soc-pcm5102a,\
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
-,55))
-
-ifeq ($(KERNEL_BASE),3)
-ifeq ($(KERNEL_MAJ),10)
-$(eval $(call KMOD_template,SND_SOC_SPDIF,snd-soc-spdif,\
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-tx \
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-rx \
-,55))
-endif
-endif
-
-$(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\
-	$(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \
-	$(MODULES_DIR)/kernel/sound/pci/snd-via82xx \
-,55))
-
-$(eval $(call KMOD_template,SND_INTEL8X0,snd-intel8x0,\
-	$(MODULES_DIR)/kernel/sound/pci/snd-intel8x0 \
-,55))
-
-$(eval $(call KMOD_template,SND_ENS1370,snd-ens1370,\
-	$(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \
-,55))
-
-$(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
-	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
-,55))
-
-$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
-	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
-	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
-	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8750 \
-	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
-	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
-	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
-,60, kmod-snd-soc))
-
-$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-hdmi-codec \
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-sgtl5000 \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/imx-hdmi-dma \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-hdmi \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-ssi \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-audmux \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-hdmi \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
-	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-sgtl5000 \
-,60, kmod-snd-soc))
-
-$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
-	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
-,60))
-
-$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2708-soc-i2s,\
-	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
-,60, kmod-snd-soc kmod-snd-soc-pcm5102a))
-
-$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2708-soc-hifiberry-dac,\
-	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
-,65, kmod-snd-bcm2708-soc-i2s))
-
-$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2708-soc-hifiberry-digi,\
-	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
-,65, kmod-snd-bcm2708-soc-i2s))
-
-$(eval $(call KMOD_template,SND_BCM2708_SOC_RPI_DAC,snd-bcm2708-soc-rpi-dac,\
-	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-rpi-dac \
-,65, kmod-snd-bcm2708-soc-i2s))
-
-$(eval $(call KMOD_template,SND_BCM2708_SOC_IQAUDIO_DAC,snd-bcm2708-soc-iqaudio-dac,\
-	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-iqaudio-dac \
-,65, kmod-snd-bcm2708-soc-i2s))
-
-
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
 	$(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
 ,70))