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

Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-15 10:16:36 -08:00
parent 22f8ca065a 2a1b818ef7
commit b487be0ca1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/zfs-build.m4
View File

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

2
scripts/zfs.sh
View File

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