From 686d42199b90f8244ea9d37c66acd7ef3c6aa2ed Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 25 Oct 2012 15:11:35 +0000 Subject: [PATCH] kernel: fix the pcspkr module, add proper dependencies, add the actual sound module SVN-Revision: 33921 --- package/kernel/modules/sound.mk | 36 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 4ccdc8b806..3d12ba650f 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -7,21 +7,6 @@ SOUND_MENU:=Sound Support -define KernelPackage/pcspkr - SUBMENU:=$(SOUND_MENU) - TITLE:=PC speaker support - KCONFIG:=CONFIG_INPUT_PCSPKR - FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko - AUTOLOAD:=$(call AutoLoad,50,pcspkr) -endef - -define KernelPackage/pcspkr/description - This enables sounds (tones) through the pc speaker -endef - -$(eval $(call KernelPackage,pcspkr)) - - # allow targets to override the soundcore stuff SOUNDCORE_LOAD ?= \ soundcore \ @@ -201,3 +186,24 @@ define KernelPackage/sound-soc-gw_avila endef $(eval $(call KernelPackage,sound-soc-gw_avila)) + + +define KernelPackage/pcspkr + DEPENDS:=@!TARGET_x86 + TITLE:=PC speaker support + KCONFIG:= \ + CONFIG_INPUT_PCSPKR \ + CONFIG_SND_PCSP + FILES:= \ + $(LINUX_DIR)/drivers/input/misc/pcspkr.ko \ + $(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko + AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp) + $(call AddDepends/input) + $(call AddDepends/sound) +endef + +define KernelPackage/pcspkr/description + This enables sounds (tones) through the pc speaker +endef + +$(eval $(call KernelPackage,pcspkr)) -- 2.30.2