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-01-05 14:14:01 -08:00
parent b17fd93022 40a02d3a0d
commit c0e4b11e0e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/unicode/u8_textprep.c
View File

@ -45,11 +45,11 @@
#include <sys/ddi.h> #include <sys/ddi.h>
#include <sys/sunddi.h> #include <sys/sunddi.h>
#else #else
#include <sys/u8_textprep.h>
#include <strings.h> #include <strings.h>
#endif /* _KERNEL */ #endif /* _KERNEL */
#include <sys/byteorder.h> #include <sys/byteorder.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/u8_textprep.h>
#include <sys/u8_textprep_data.h> #include <sys/u8_textprep_data.h>

3
module/unicode/uconv.c
View File

@ -42,11 +42,10 @@
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/sunddi.h> #include <sys/sunddi.h>
#else
#include <sys/u8_textprep.h>
#endif /* _KERNEL */ #endif /* _KERNEL */
#include <sys/byteorder.h> #include <sys/byteorder.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/u8_textprep.h>
/* /*