[source] kernel: fix duplicate drivers for the PC speaker in one package

LEDE Commits lede-commits at lists.infradead.org
Sun Jul 3 13:55:17 PDT 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=f5088dc13f5aaaf3eade8cc78f3904eafdca9440

commit f5088dc13f5aaaf3eade8cc78f3904eafdca9440
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sun Jul 3 19:35:42 2016 +0200

    kernel: fix duplicate drivers for the PC speaker in one package
    
    Only use the ALSA capable one, it supports regular beeps as well
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/kernel/linux/modules/sound.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index d09cf21..52a44d6 100644
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -259,12 +259,10 @@ define KernelPackage/pcspkr
   DEPENDS:=@TARGET_x86 +kmod-input-core
   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)
+  AUTOLOAD:=$(call AutoLoad,50,snd-pcsp)
   $(call AddDepends/sound)
 endef
 



More information about the lede-commits mailing list