Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

This commit is contained in:
Brian Behlendorf 2010-05-14 13:31:27 -07:00
parent 08eb7517c4 98d5d8bd50
commit d6f1f21cae
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zpool/Makefile.am
View File

@ -7,6 +7,7 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include

1
lib/libnvpair/Makefile.am
View File

@ -11,6 +11,7 @@ libnvpair_la_SOURCES = \
${top_srcdir}/lib/libnvpair/libnvpair.c \
${top_srcdir}/lib/libnvpair/nvpair_alloc_system.c \
${top_srcdir}/lib/libnvpair/include/libnvpair.h \
${top_srcdir}/module/nvpair/nvpair_alloc_fixed.c \
${top_srcdir}/module/nvpair/nvpair.c \
${top_srcdir}/module/nvpair/include/sys/nvpair.h \
${top_srcdir}/module/nvpair/include/sys/nvpair_impl.h