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

Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2010-04-29 12:33:21 -07:00
parent 3adc3d2d7d 98660aec20
commit a2a5e4f1f1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/nvpair/Makefile.in
View File

@ -7,3 +7,4 @@ obj-m := ${MODULE}.o
${MODULE}-objs += nvpair.o ${MODULE}-objs += nvpair.o
${MODULE}-objs += nvpair_alloc_spl.o ${MODULE}-objs += nvpair_alloc_spl.o
${MODULE}-objs += nvpair_alloc_fixed.o

2
module/nvpair/nvpair_alloc_fixed.c
View File

@ -24,7 +24,7 @@
* Use is subject to license terms. * Use is subject to license terms.
*/ */
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/stropts.h> #include <sys/stropts.h>
#include <sys/isa_defs.h> #include <sys/isa_defs.h>