From 309b0c7817ca39138f440d24cbe5f860ca7ee919 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 16 Sep 2007 19:16:10 +0000
Subject: [PATCH] move kmod-nbd & kmod-loop from other.mk to block.mk, disable
 cryptoloop since it's not packaged anywhere

SVN-Revision: 8812
---
 package/kernel/modules/block.mk | 32 ++++++++++++++++++++++++++++++++
 package/kernel/modules/other.mk | 30 ------------------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 2bccf0b47b..ae64fb6b74 100644
--- 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))
+
+
+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 79af470e4c..352bfb0012 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -156,36 +156,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
-- 
2.30.2