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 f00fb32..3e1cab4 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -64,6 +64,24 @@ define KernelPackage/ide-pdc202xx
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+define KernelPackage/ide-aec62xx
+  TITLE:=AEC62xx IDE driver
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,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
@@ -141,7 +159,7 @@ define KernelPackage/pcmcia-core/2.6
        $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
 endef
 $(eval $(call KernelPackage,pcmcia-core))
 
@@ -168,12 +186,14 @@ $(eval $(call KernelPackage,pcmcia-serial))
 
 define KernelPackage/bluetooth
   TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
   SUBMENU:=$(EMENU)
  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) \
@@ -185,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) \
@@ -197,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
@@ -206,12 +243,22 @@ define KernelPackage/softdog
   FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
+
+define KernelPackage/softdog/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.o
+endef
+
+define KernelPackage/softdog/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/char/watchdog/softdog.ko
+endef
+
 $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
+  DEPENDS:=@VIDEO_SUPPORT
   SUBMENU:=$(EMENU)
   KCONFIG:=$(CONFIG_VIDEO_DEV)
   FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
@@ -222,7 +269,7 @@ define KernelPackage/videodev/2.4
 endef
 
 define KernelPackage/videodev/2.6
-  AUTOLOAD:=$(call AutoLoad,60,v4l2-common videodev)
+  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat videodev)
 endef
 $(eval $(call KernelPackage,videodev))