Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch

2009-07-07 14:50:41 -07:00 · 2009-07-07 14:50:41 -07:00 · c35e61eea2
parent 1802e07a93 04aa3d5ef9
commit c35e61eea2
1 changed files with 1 additions and 1 deletions
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@ -47,8 +47,8 @@
 #include <ucred.h>
 #ifdef HAVE_IDMAP
 #include <idmap.h>
-#endif /* HAVE_IDMAP */
 #include <aclutils.h>
+#endif /* HAVE_IDMAP */

 #include <sys/spa.h>
 #include <sys/zap.h>