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

This commit is contained in:
Brian Behlendorf 2008-12-22 10:11:32 -08:00
commit a724734a9b
1 changed files with 2 additions and 0 deletions

View File

@ -64,7 +64,9 @@
#include <devid.h> #include <devid.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_LIBDISKMGT
#include <libdiskmgt.h> #include <libdiskmgt.h>
#endif
#include <libintl.h> #include <libintl.h>
#include <libnvpair.h> #include <libnvpair.h>
#include <stdio.h> #include <stdio.h>