From 7f3d638c4ab95728f03c177dd2cd90901f97a7d8 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 17 Oct 2006 21:19:49 +0000
Subject: [PATCH] port soundcore module

SVN-Revision: 5199
---
 include/modules-2.4.mk          |  4 ----
 include/modules-2.6.mk          |  4 ----
 package/kernel/modules/other.mk | 17 +++++++++++++++++
 target/linux/Config.in          |  8 --------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk
index 007f6600cc..591250cb9d 100644
--- a/include/modules-2.4.mk
+++ b/include/modules-2.4.mk
@@ -62,10 +62,6 @@ $(eval $(call KMOD_template,PWC,pwc,\
 	$(MODULES_DIR)/kernel/drivers/usb/pwc.o \
 ,CONFIG_USB_PWC,kmod-videodev,63,pwc))
 
-$(eval $(call KMOD_template,SOUNDCORE,soundcore,\
-	$(MODULES_DIR)/kernel/drivers/sound/soundcore.o \
-,CONFIG_SOUND,,30,soundcore))
-
 $(eval $(call KMOD_template,VIDEODEV,videodev,\
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev.o \
 ,CONFIG_VIDEO_DEV,,62,videodev))
diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index a44800d594..e22ac7f233 100644
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -62,10 +62,6 @@ $(eval $(call KMOD_template,PWC,pwc,\
 	$(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \
 ,CONFIG_USB_PWC,kmod-videodev,63,pwc))
 
-$(eval $(call KMOD_template,SOUNDCORE,soundcore,\
-	$(MODULES_DIR)/kernel/sound/soundcore.ko \
-,CONFIG_SOUND,,30,soundcore))
-
 $(eval $(call KMOD_template,VIDEODEV,videodev,\
 	$(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat.ko \
 	$(MODULES_DIR)/kernel/drivers/media/video/v4l2-common.ko \
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 44ef7e1e5f..475fcd0def 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -81,4 +81,21 @@ endef
 $(eval $(call KernelPackage,lp))
 
 
+define KernelPackage/soundcore
+  TITLE:=Sound support
+  DESCRIPTION:=Kernel modules for sound support
+  KCONFIG:=$(CONFIG_SOUND)
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore)
+endef
+
+define KernelPackage/soundcore/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/soundcore/2.6
+  FILES:=$(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,soundcore))
+
 
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 21d7d58d42..afdcb64c69 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -83,14 +83,6 @@ config PACKAGE_KMOD_PWC
 	depends PACKAGE_kmod-usb-core
 	default m
 
-config PACKAGE_KMOD_SOUNDCORE
-	prompt "kmod-soundcore.................... Soundcard support"
-	tristate
-	default n
-	help
-	  Base support for soundcards
-	  Requires either USB soundcard support (OSS) or ALSA package to be useful
-
 config PACKAGE_KMOD_VIDEODEV
 	prompt "kmod-videodev..................... Video (For Linux) kernel support"
 	tristate