kernel: backport netfilter NAT offload support to 4.14

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

diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index 13b0bb0dfe9dbea3d87946044787a6a94a4967b1..faee1f3674ef144021393b0825bf9434a8b1998a 100644 (file)
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -24,7 +24,8 @@ 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 \
+       $(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-rawmidi.ko \
        $(LINUX_DIR)/sound/core/snd-timer.ko \
        $(LINUX_DIR)/sound/core/snd-pcm.ko \
@@ -49,6 +50,7 @@ define KernelPackage/sound-core
        CONFIG_SND_RAWMIDI \
        CONFIG_SND_TIMER \
        CONFIG_SND_PCM \
+       CONFIG_SND_PCM_TIMER=y \
        CONFIG_SND_SEQUENCER \
        CONFIG_SND_VIRMIDI \
        CONFIG_SND_SEQ_DUMMY \
@@ -66,7 +68,7 @@ define KernelPackage/sound-core/uml
   FILES:= \
        $(LINUX_DIR)/sound/soundcore.ko \
        $(LINUX_DIR)/arch/um/drivers/hostaudio.ko
-  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+  AUTOLOAD+=$(call AutoLoad,30,soundcore hostaudio)
 endef
 
 define KernelPackage/sound-core/description
@@ -292,17 +294,17 @@ define KernelPackage/sound-hda-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=HD Audio Sound Core Support
   KCONFIG:= \
-       CONFIG_SND_HDA_CORE \
+       CONFIG_SND_HDA_CORE@ge4.1 \
        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 \
+       $(LINUX_DIR)/sound/hda/snd-hda-core.ko@ge4.1 \
        $(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 snd-hda-codec snd-hda-codec-generic)
+  AUTOLOAD:=$(call AutoProbe,snd-hda-core@ge4.1 snd-hda-codec snd-hda-codec-generic)
   $(call AddDepends/sound,+kmod-regmap)
 endef
 
@@ -507,8 +509,9 @@ define KernelPackage/sound-hda-intel
        CONFIG_SOUND_PCI \
        CONFIG_SND_HDA_INTEL
   FILES:= \
-       $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko
-  AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
+       $(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)
   $(call AddDepends/sound,kmod-sound-hda-core)
 endef