aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux/modules/sound.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-24 22:13:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-24 22:13:22 +0000
commit47e651e2ebd313a75130c9e7746f7b2f501488b4 (patch)
tree8f57bcc4e7c784e93b72e7cd9139ceeb6c9c3d69 /package/kernel/linux/modules/sound.mk
parent77aa8e8aee1563ac90feb40aec277da6e0ecc139 (diff)
downloadupstream-47e651e2ebd313a75130c9e7746f7b2f501488b4.tar.gz
upstream-47e651e2ebd313a75130c9e7746f7b2f501488b4.tar.bz2
upstream-47e651e2ebd313a75130c9e7746f7b2f501488b4.zip
kernel: drop obsolete kernel version checks
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44113
Diffstat (limited to 'package/kernel/linux/modules/sound.mk')
-rw-r--r--package/kernel/linux/modules/sound.mk25
1 files changed, 3 insertions, 22 deletions
diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index be01638174..964524b0af 100644
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -17,7 +17,8 @@ SOUNDCORE_LOAD ?= \
snd-timer \
snd-pcm \
snd-mixer-oss \
- snd-pcm-oss
+ snd-pcm-oss \
+ snd-compress
SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/soundcore.ko \
@@ -28,15 +29,8 @@ SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/core/snd-timer.ko \
$(LINUX_DIR)/sound/core/snd-pcm.ko \
$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
- $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
-
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3.0)),1)
-SOUNDCORE_LOAD += \
- snd-compress
-
-SOUNDCORE_FILES += \
+ $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko \
$(LINUX_DIR)/sound/core/snd-compress.ko
-endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.12.0)),1)
SOUNDCORE_LOAD += \
@@ -196,18 +190,6 @@ $(eval $(call KernelPackage,sound-soc-ac97))
define KernelPackage/sound-soc-imx
TITLE:=IMX SoC support
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
- KCONFIG:=\
- CONFIG_SND_IMX_SOC \
- CONFIG_SND_SOC_IMX_AUDMUX \
- CONFIG_SND_SOC_FSL_SSI \
- CONFIG_SND_SOC_IMX_PCM
- FILES:= \
- $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \
- $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
- $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko
- AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
-else
KCONFIG:=\
CONFIG_SND_IMX_SOC \
CONFIG_SND_SOC_IMX_AUDMUX \
@@ -218,7 +200,6 @@ else
$(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
$(LINUX_DIR)/sound/soc/fsl/imx-pcm-dma.ko
AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
-endif
DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core
$(call AddDepends/sound)
endef