From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 3 Jul 2016 17:35:42 +0000 (+0200)
Subject: kernel: fix duplicate drivers for the PC speaker in one package
X-Git-Tag: v17.01.0-rc1~2174
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f5088dc13f5aaaf3eade8cc78f3904eafdca9440;p=openwrt%2Fopenwrt.git

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@nbd.name>
---

diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index d09cf21aba..52a44d6a8a 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