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

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

This commit is contained in:
Brian Behlendorf 2009-07-07 10:15:06 -07:00
parent 6a6c62017d 70804727b1
commit 0fd826cf09
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzpool/include/sys/zfs_context.h
View File

@ -58,7 +58,6 @@ extern "C" {
#include <atomic.h> #include <atomic.h>
#include <dirent.h> #include <dirent.h>
#include <time.h> #include <time.h>
#include <libsysevent.h>
#include <sys/note.h> #include <sys/note.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/cred.h> #include <sys/cred.h>
@ -72,8 +71,11 @@ extern "C" {
#include <sys/sdt.h> #include <sys/sdt.h>
#include <sys/kstat.h> #include <sys/kstat.h>
#include <sys/u8_textprep.h> #include <sys/u8_textprep.h>
#ifdef HAVE_SYSEVENT
#include <libsysevent.h>
#include <sys/sysevent/eventdefs.h> #include <sys/sysevent/eventdefs.h>
#include <sys/sysevent/dev.h> #include <sys/sysevent/dev.h>
#endif /* HAVE_SYSEVENT */
/* /*
* Stack * Stack