check if oss emulation is available before trying to package it into soundcore

[openwrt/svn-archive/archive.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a30046daf5d4572eee228dee9485acd804537896..fd9ade97c03fb55a7af6b4b8ce3ba1d0db99faec 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -33,7 +33,9 @@ define KernelPackage/crypto
        $(CONFIG_CRYPTO_ANUBIS) \
        $(CONFIG_CRYPTO_DEFLATE) \
        $(CONFIG_CRYPTO_MICHAEL_MIC) \
-       $(CONFIG_CRYPTO_CRC32C)
+       $(CONFIG_CRYPTO_CRC32C) \
+       $(CONFIG_CRYPTO_ECB)) \
+       $(CONFIG_CRYPTO_BLKCIPHER) 
   FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
 endef
@@ -115,11 +117,20 @@ define KernelPackage/soundcore/2.6
   FILES:= \
        $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
+       $(if $(CONFIG_SND_MIXER_OSS)$(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/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
+  FILES:= \
+       $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+endef
+
 $(eval $(call KernelPackage,soundcore))
 
+
 define KernelPackage/loop
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support
@@ -169,6 +180,7 @@ define KernelPackage/pcmcia-core/2.6
   KCONFIG:=$(CONFIG_PCCARD)
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+       $(if $(CONFIG_PCMCIA),$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)) \
        $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
@@ -281,7 +293,7 @@ define KernelPackage/videodev/2.4
 endef
 
 define KernelPackage/videodev/2.6
-  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat videodev)
+  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat compat_ioctl32 videodev)
 endef
 $(eval $(call KernelPackage,videodev))
 
@@ -329,7 +341,7 @@ define KernelPackage/scx200-wdt
   SUBMENU:=$(EMENU)
   KCONFIG:=$(CONFIG_SC1200_WDT)
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,scx200_wt)
+  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
 $(eval $(call KernelPackage,scx200-wdt))
 
@@ -357,3 +369,25 @@ define KernelPackage/hwmon-pc87360
   AUTOLOAD:=$(call AutoLoad,50,pc87360)
 endef
 $(eval $(call KernelPackage,hwmon-pc87360))
+
+define KernelPackage/input-core
+  TITLE:=Input device core
+  DESCRIPTION:=Kernel modules for support of input device
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_INPUT)
+  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,input-core)
+endef
+$(eval $(call KernelPackage,input-core))
+
+define KernelPackage/input-evdev
+  TITLE:=Input even device
+  DESCRIPTION:=Kernel modules for support of input device events
+  DEPENDS:=+kmod-input-core
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_INPUT_EVDEV)
+  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,evdev)
+endef
+$(eval $(call KernelPackage,input-evdev))
+