revert bluetooth kconfig change - it doesn't work that way

[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 d86608987ddd69bd8aebdae19a40ae65ebb8c0a0..e60927f2f38156537988dd9aad26f96d66bddffd 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)
@@ -206,6 +216,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
@@ -241,7 +267,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))