summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile9
-rw-r--r--sys/modules/iscsi/Makefile10
2 files changed, 8 insertions, 11 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 5c74856..7498dab 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -47,7 +47,7 @@ SUBDIR= \
ata \
ath \
ath_pci \
- autofs \
+ ${_autofs} \
${_auxio} \
${_bce} \
bfe \
@@ -382,6 +382,10 @@ SUBDIR= \
${_zfs} \
zlib
+.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
+_autofs= autofs
+.endif
+
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
@@ -620,8 +624,11 @@ _qlxge= qlxge
_qlxgb= qlxgb
_qlxgbe= qlxgbe
_sfxge= sfxge
+
+.if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
_vmm= vmm
.endif
+.endif
.if ${MACHINE_CPUARCH} == "i386"
# XXX some of these can move to the general case when de-i386'ed
diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile
index d072cfb..2bff545 100644
--- a/sys/modules/iscsi/Makefile
+++ b/sys/modules/iscsi/Makefile
@@ -4,22 +4,12 @@
KMOD= iscsi
SRCS= iscsi.c
-.if defined(ICL_RDMA)
-SRCS+= icl_rdma.c
-.else
SRCS+= icl.c
-.endif
SRCS+= icl_proxy.c
SRCS+= opt_cam.h
SRCS+= bus_if.h
SRCS+= device_if.h
-# Those below are required for RDMA.
-SRCS+= vnode_if.h
-SRCS+= opt_inet.h
-SRCS+= opt_inet6.h
-
-CFLAGS+= -I${.CURDIR}/../../ofed/include
#CFLAGS+=-DICL_KERNEL_PROXY
.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud