package/kernel: move pcspkr to sound.mk

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21135 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 16 insertions, 17 deletions

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 10db180e5..bc567fb65 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -100,23 +100,6 @@ endef
 
 $(eval $(call KernelPackage,lp))
 
-define KernelPackage/pcspkr
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=PC speaker support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=CONFIG_INPUT_PCSPKR
-  FILES:= \
-	$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	pcspkr \
-  )
-endef
-
-define KernelPackage/pcspkr/description
- This enables sounds (tones) through the pc speaker
-endef
-
-$(eval $(call KernelPackage,pcspkr))
 
 define KernelPackage/pcmcia-core
   SUBMENU:=$(OTHER_MENU)
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 3d2bd27b5..ef6b0a9da 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -7,6 +7,22 @@
 
 SOUND_MENU:=Sound Support
 
+define KernelPackage/pcspkr
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=PC speaker support
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_INPUT_PCSPKR
+  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,pcspkr)
+endef
+
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
+endef
+
+$(eval $(call KernelPackage,pcspkr))
+
+
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support