Module Name: src
Committed By: christos
Date: Sat Jun 18 21:45:05 UTC 2016
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
avoid duplicate symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.5 src/sys/modules/zfs/Makefile.zfsmod:1.6
--- src/sys/modules/zfs/Makefile.zfsmod:1.5 Tue Apr 22 11:12:52 2014
+++ src/sys/modules/zfs/Makefile.zfsmod Sat Jun 18 17:45:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.5 2014/04/22 15:12:52 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.6 2016/06/18 21:45:05 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -18,7 +18,7 @@ SRCS+= zprop_common.c
.PATH: ${ZFSDIR}/dist/uts/common/zmod
-SRCS+= trees.c
+#SRCS+= trees.c
.PATH: ${ZFSDIR}/lib/libzpool
@@ -93,7 +93,7 @@ SRCS+= zio.c
SRCS+= zio_checksum.c
SRCS+= zio_compress.c
SRCS+= zio_inject.c
-SRCS+= zutil.c
+#SRCS+= zutil.c
SRCS+= zvol.c
SRCS+= zle.c
