Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-15 16:37:12 -08:00
commit accc1cd03f
2 changed files with 3 additions and 1 deletions

View File

@ -1 +1 @@
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am EXTRA_DIST = *.m4 Rules.am

View File

@ -2,4 +2,6 @@ dnl #
dnl # Default ZFS user configuration dnl # Default ZFS user configuration
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER], [ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_LIBEFI
ZFS_AC_CONFIG_USER_IOCTL
]) ])