Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
This commit is contained in:
commit
15506fc558
|
@ -1 +1 @@
|
||||||
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am
|
EXTRA_DIST = *.m4 Rules.am
|
||||||
|
|
|
@ -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
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue