Bluetooth depends on USB for 2.6 kernels also

[openwrt.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index b65df98..3e1cab4 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -73,6 +73,16 @@ define KernelPackage/ide-aec62xx
 endef
 $(eval $(call KernelPackage,ide-aec62xx))
 
+define KernelPackage/scsi-core
+  TITLE:=Kernel support for SCSI
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_SD)
+  FILES:= \
+    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+    $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,scsi-core))
+
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
   KCONFIG:=$(CONFIG_PARPORT)
@@ -182,7 +192,8 @@ define KernelPackage/bluetooth
  endef
 
  define KernelPackage/bluetooth/2.4
-  KCONFIG:=$(CONFIG_BLUEZ)
+  KCONFIG:=$(CONFIG_BLUEZ) \
+          $(CONFIG_USB)
   FILES:= \
        $(MODULES_DIR)/kernel/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -194,7 +205,8 @@ define KernelPackage/bluetooth
 endef
 
 define KernelPackage/bluetooth/2.6
-  KCONFIG:=$(CONFIG_BT)
+  KCONFIG:=$(CONFIG_BT) \
+       $(CONFIG_USB)
   FILES:= \
        $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -206,6 +218,22 @@ define KernelPackage/bluetooth/2.6
 endef
 $(eval $(call KernelPackage,bluetooth))
 
+define KernelPackage/mmc
+  TITLE:=MMC/SD Card Support
+  DEPENDS:=@LINUX_2_6_AT91
+  DESCRIPTION:=Kernel support for MMC/SD cards
+  SUBMENU:=$(EMENU)
+ endef
+
+define KernelPackage/mmc/2.6
+       KCONFIG:=$(CONFIG_MMC)
+       FILES:= \
+       $(MODULES_DIR)/kernel/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
+       AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
+endef
+$(eval $(call KernelPackage,mmc))
 
 define KernelPackage/softdog
   TITLE:=Software watchdog driver