X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ee3549fd86a48cbc88c67c458b2225ef31e0fb2a..71a4f236661616ac54546b6658a15a84d2ff7cf9:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 79af470e4..9b5bc6d46 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -92,9 +92,11 @@ 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:=@PCI_SUPPORT||USB_SUPPORT @!TARGET_atheros
   KCONFIG:= \
 	CONFIG_SOUND \
 	CONFIG_SND \
@@ -156,57 +158,6 @@ endef
 $(eval $(call KernelPackage,soundcore))
 
 
-define KernelPackage/loop
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Loopback device support
-  KCONFIG:=CONFIG_BLK_DEV_LOOP
-  FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,loop)
-endef
-
-define KernelPackage/loop/description
- Kernel module for loopback device support
-endef
-
-$(eval $(call KernelPackage,loop))
-
-
-define KernelPackage/nbd
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Network block device support
-  KCONFIG:=CONFIG_BLK_DEV_NBD
-  FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,nbd)
-endef
-
-define KernelPackage/nbd/description
- Kernel module for network block device support
-endef
-
-$(eval $(call KernelPackage,nbd))
-
-
-define KernelPackage/capi
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=CAPI Support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:= \
-	CONFIG_ISDN \
-	CONFIG_ISDN_CAPI \
-	CONFIG_ISDN_CAPI_CAPI20
-  FILES:= \
-	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
-endef
-
-define KernelPackage/capi/description
- Kernel module for basic CAPI support
-endef
-
-$(eval $(call KernelPackage,capi))
-
-
 define KernelPackage/pcmcia-core
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PCMCIA/CardBus support
@@ -289,10 +240,11 @@ endef
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
+# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT @!TARGET_atheros
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -417,6 +369,22 @@ endef
 $(eval $(call KernelPackage,leds-net48xx))
 
 
+define KernelPackage/leds-wrap
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PCengines WRAP LED support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_LEDS_WRAP
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
+endef
+
+define KernelPackage/leds-wrap/description
+ Kernel module for PCengines WRAP LEDs
+endef
+
+$(eval $(call KernelPackage,leds-wrap))
+
+
 define KernelPackage/nsc-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support