[packages] kmod-dm: Set CONFIG_DM_LOG_USERSPACE=n

[openwrt/svn-archive/archive.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 63791cf32ec2cbff82313ed265cd6429cddb8ee5..c6d389491d287e9ab663feb1e461f00f5655a484 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -321,7 +321,7 @@ define KernelPackage/scsi-core
        CONFIG_SCSI \
        CONFIG_BLK_DEV_SD
   FILES:= \
-       $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+       $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \
        $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod)
 endef
@@ -389,6 +389,7 @@ define KernelPackage/dm
        CONFIG_DM_MULTIPATH=n \
        CONFIG_DM_ZERO=n \
        CONFIG_DM_SNAPSHOT=n \
+       CONFIG_DM_LOG_USERSPACE=n \
        CONFIG_MD=y \
        CONFIG_BLK_DEV_DM \
        CONFIG_DM_MIRROR