move kmod-nbd & kmod-loop from other.mk to block.mk, disable cryptoloop since it...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8812 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 2bccf0b..ae64fb6 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -136,3 +136,35 @@ define KernelPackage/scsi-core
 endef
 
 $(eval $(call KernelPackage,scsi-core))
 endef
 
 $(eval $(call KernelPackage,scsi-core))

+
+
+define KernelPackage/loop
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Loopback device support
+  KCONFIG:= \
+       CONFIG_BLK_DEV_LOOP \
+       CONFIG_BLK_DEV_CRYPTOLOOP=n
+  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:=$(BLOCK_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))

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 79af470..352bfb0 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -156,36 +156,6 @@ endef
 $(eval $(call KernelPackage,soundcore))
 
 
 $(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
 define KernelPackage/capi
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CAPI Support