aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-17 21:19:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-17 21:19:49 +0000
commit3095de0db1dd58839d6a650464dc7bd71b64afd8 (patch)
tree43e2d97b819791dbbea37f5e476617630f50bbfd
parentcff0488525dccf7fd0b5c003377ad00e1cb74dfc (diff)
downloadupstream-3095de0db1dd58839d6a650464dc7bd71b64afd8.tar.gz
upstream-3095de0db1dd58839d6a650464dc7bd71b64afd8.tar.bz2
upstream-3095de0db1dd58839d6a650464dc7bd71b64afd8.zip
port soundcore module
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5199 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/modules-2.4.mk4
-rw-r--r--include/modules-2.6.mk4
-rw-r--r--package/kernel/modules/other.mk17
-rw-r--r--target/linux/Config.in8
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