diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-09-20 10:27:38 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-09-20 10:27:38 +0000 |
| commit | 5d4246a015943001b92d218a581e922b909f17ef (patch) | |
| tree | 5c0a88e2acaab21266f8763fa0f6bc578fb7f7eb | |
| parent | ca32501abe739fcb00bab62a48fe02a0dabba8a5 (diff) | |
| download | upstream-5d4246a015943001b92d218a581e922b909f17ef.tar.gz upstream-5d4246a015943001b92d218a581e922b909f17ef.tar.bz2 upstream-5d4246a015943001b92d218a581e922b909f17ef.zip | |
move kernel sound support in its own file from other.mk to sound.mk, rename kmod-soundcore to kmod-sound-core to be consistent, cleanup alsa-lib
SVN-Revision: 8865
| -rw-r--r-- | package/kernel/modules/other.mk | 66 | ||||
| -rw-r--r-- | package/kernel/modules/sound.mk | 75 |
2 files changed, 75 insertions, 66 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 171c9ce711..c13675739f 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -92,72 +92,6 @@ endef $(eval $(call KernelPackage,lp)) -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets -define KernelPackage/soundcore - SUBMENU:=$(OTHER_MENU) - TITLE:=Sound support - DEPENDS:=@USB_SUPPORT @!TARGET_atheros - KCONFIG:= \ - CONFIG_SOUND \ - CONFIG_SND \ - CONFIG_SND_HWDEP \ - CONFIG_SND_RAWMIDI \ - CONFIG_SND_TIMER \ - CONFIG_SND_PCM \ - CONFIG_HOSTAUDIO -endef - -define KernelPackage/soundcore/2.4 - FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,soundcore) -endef - -define KernelPackage/soundcore/2.6 -# KCONFIG+= \ -# CONFIG_SND \ -# CONFIG_SND_HWDEP \ -# CONFIG_SND_RAWMIDI \ -# CONFIG_SND_TIMER \ -# CONFIG_SND_PCM - FILES:= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \ - $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \ - $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,30, \ - soundcore \ - snd \ - snd-page-alloc \ - snd-hwdep \ - snd-rawmidi \ - snd-timer \ - snd-pcm \ - $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \ - $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \ - ) -endef - -define KernelPackage/soundcore/uml-2.6 -# KCONFIG+= \ -# CONFIG_HOSTAUDIO - FILES:= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio) -endef - -define KernelPackage/soundcore/description - Kernel modules for sound support -endef - -$(eval $(call KernelPackage,soundcore)) - - define KernelPackage/pcmcia-core SUBMENU:=$(OTHER_MENU) TITLE:=PCMCIA/CardBus support diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk new file mode 100644 index 0000000000..78dd33469d --- /dev/null +++ b/package/kernel/modules/sound.mk @@ -0,0 +1,75 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +SOUND_MENU:=Sound Support + +# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets +define KernelPackage/sound-core + SUBMENU:=$(SOUND_MENU) + TITLE:=Sound support + DEPENDS:=@USB_SUPPORT @!TARGET_atheros + KCONFIG:= \ + CONFIG_SOUND \ + CONFIG_SND \ + CONFIG_SND_HWDEP \ + CONFIG_SND_RAWMIDI \ + CONFIG_SND_TIMER \ + CONFIG_SND_PCM \ + CONFIG_HOSTAUDIO +endef + +define KernelPackage/sound-core/2.4 + FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,soundcore) +endef + +define KernelPackage/sound-core/2.6 +# KCONFIG+= \ +# CONFIG_SND \ +# CONFIG_SND_HWDEP \ +# CONFIG_SND_RAWMIDI \ +# CONFIG_SND_TIMER \ +# CONFIG_SND_PCM + FILES:= \ + $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \ + $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \ + $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX)) + AUTOLOAD:=$(call AutoLoad,30, \ + soundcore \ + snd \ + snd-page-alloc \ + snd-hwdep \ + snd-rawmidi \ + snd-timer \ + snd-pcm \ + $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \ + $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \ + ) +endef + +define KernelPackage/sound-core/uml-2.6 +# KCONFIG+= \ +# CONFIG_HOSTAUDIO + FILES:= \ + $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio) +endef + +define KernelPackage/sound-core/description + Kernel modules for sound support +endef + +$(eval $(call KernelPackage,sound-core)) + |