Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2009-01-15 10:17:55 -08:00
commit 6678399085
2 changed files with 3 additions and 3 deletions

View File

@ -149,8 +149,8 @@ AC_DEFUN([ZFS_AC_SPL], [
AC_MSG_RESULT([$splsrcver])
AC_MSG_CHECKING([spl Module.symvers])
if test -r $splbuild/modules/Module.symvers; then
splsymvers=$splbuild/modules/Module.symvers
if test -r $splbuild/module/Module.symvers; then
splsymvers=$splbuild/module/Module.symvers
elif test -r $kernelbuild/Module.symvers; then
splsymvers=$kernelbuild/Module.symvers
fi

View File

@ -14,7 +14,7 @@ kernel_modules=( \
)
spl_modules=( \
${SPLBUILD}/modules/spl/spl.ko \
${SPLBUILD}/module/spl/spl.ko \
)
zfs_modules=( \