Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem

2010-04-29 12:32:57 -07:00 · 2010-04-29 12:32:57 -07:00 · d4fcfa8cd6
parent f4295781e2 98660aec20
commit d4fcfa8cd6
2 changed files with 2 additions and 1 deletions
--- a/module/nvpair/Makefile.in
+++ b/module/nvpair/Makefile.in
@ -7,3 +7,4 @@ obj-m := ${MODULE}.o

 ${MODULE}-objs += nvpair.o
 ${MODULE}-objs += nvpair_alloc_spl.o
+${MODULE}-objs += nvpair_alloc_fixed.o
--- a/module/nvpair/nvpair_alloc_fixed.c
+++ b/module/nvpair/nvpair_alloc_fixed.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/stropts.h>
 #include <sys/isa_defs.h>