kernel: kmod-zram: break the strict dependency from lz4

[openwrt/staging/wigyori.git] / package / kernel / linux / modules / sound.mk

diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index 177140e0fc181d7408b452f558a187fb467cde2f..f975103e508cb96c110cbc6b24c410bc125cdb05 100644 (file)
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -24,8 +24,7 @@ SOUNDCORE_FILES ?= \
        $(LINUX_DIR)/sound/soundcore.ko \
        $(LINUX_DIR)/sound/core/snd.ko \
        $(LINUX_DIR)/sound/core/snd-hwdep.ko \
-       $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko@lt4.13 \
-       $(LINUX_DIR)/sound/core/snd-seq-device.ko@ge4.13 \
+       $(LINUX_DIR)/sound/core/snd-seq-device.ko \
        $(LINUX_DIR)/sound/core/snd-rawmidi.ko \
        $(LINUX_DIR)/sound/core/snd-timer.ko \
        $(LINUX_DIR)/sound/core/snd-pcm.ko \
@@ -188,9 +187,10 @@ $(eval $(call KernelPackage,sound-via82xx))
 
 define KernelPackage/sound-soc-core
   TITLE:=SoC sound support
-  DEPENDS:=+kmod-regmap +kmod-ac97
+  DEPENDS:=+kmod-regmap-core +kmod-ac97
   KCONFIG:= \
        CONFIG_SND_SOC \
+       CONFIG_SND_SOC_ADI=n \
        CONFIG_SND_SOC_DMAENGINE_PCM=y \
        CONFIG_SND_SOC_ALL_CODECS=n
   FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
@@ -254,25 +254,6 @@ endef
 $(eval $(call KernelPackage,sound-soc-imx-sgtl5000))
 
 
-define KernelPackage/sound-soc-gw_avila
-  TITLE:=Gateworks Avila SoC sound support
-  KCONFIG:= \
-       CONFIG_SND_GW_AVILA_SOC \
-       CONFIG_SND_GW_AVILA_SOC_PCM \
-       CONFIG_SND_GW_AVILA_SOC_HSS
-  FILES:= \
-       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
-       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \
-       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \
-       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko
-  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss)
-  DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core
-  $(call AddDepends/sound)
-endef
-
-$(eval $(call KernelPackage,sound-soc-gw_avila))
-
-
 define KernelPackage/pcspkr
   DEPENDS:=@TARGET_x86 +kmod-input-core
   TITLE:=PC speaker support
@@ -300,7 +281,7 @@ define KernelPackage/sound-dummy
   AUTOLOAD:=$(call AutoLoad,32,snd-dummy)
 endef
 
-define KernelPackage/sound_dummy/description
+define KernelPackage/sound-dummy/description
  Dummy sound device for Alsa when no hardware present
 endef
 
@@ -310,18 +291,18 @@ define KernelPackage/sound-hda-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=HD Audio Sound Core Support
   KCONFIG:= \
-       CONFIG_SND_HDA_CORE@ge4.1 \
+       CONFIG_SND_HDA_CORE \
        CONFIG_SND_HDA_HWDEP=y \
        CONFIG_SND_HDA_RECONFIG=n \
        CONFIG_SND_HDA_INPUT_BEEP=n \
        CONFIG_SND_HDA_PATCH_LOADER=n \
        CONFIG_SND_HDA_GENERIC
   FILES:= \
-       $(LINUX_DIR)/sound/hda/snd-hda-core.ko@ge4.1 \
+       $(LINUX_DIR)/sound/hda/snd-hda-core.ko \
        $(LINUX_DIR)/sound/pci/hda/snd-hda-codec.ko \
        $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-generic.ko
-  AUTOLOAD:=$(call AutoProbe,snd-hda-core@ge4.1 snd-hda-codec snd-hda-codec-generic)
-  $(call AddDepends/sound,+kmod-regmap)
+  AUTOLOAD:=$(call AutoProbe,snd-hda-core snd-hda-codec snd-hda-codec-generic)
+  $(call AddDepends/sound,+kmod-regmap-core)
 endef
 
 define KernelPackage/sound-hda-core/description
@@ -521,13 +502,14 @@ $(eval $(call KernelPackage,sound-hda-codec-hdmi))
 define KernelPackage/sound-hda-intel
   SUBMENU:=$(SOUND_MENU)
   TITLE:=HD Audio Intel Driver
+  DEPENDS:=@TARGET_x86
   KCONFIG:= \
        CONFIG_SOUND_PCI \
        CONFIG_SND_HDA_INTEL
   FILES:= \
        $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \
-       $(LINUX_DIR)/sound/pci/hda/snd-hda-controller.ko@lt4.4
-  AUTOLOAD:=$(call AutoProbe,snd-hda-controller@lt4.4 snd-hda-intel)
+       $(LINUX_DIR)/sound/hda/snd-intel-nhlt.ko@ge5.4
+  AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
   $(call AddDepends/sound,kmod-sound-hda-core)
 endef