From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 18 Feb 2009 22:28:46 +0000 (-0800)
Subject: Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
X-Git-Tag: zfs-0.4.4~12^2~48^2~1^2^2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=baf389bedc9e0792081934d141972bb908ac989d;p=zfs

Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
---

baf389bedc9e0792081934d141972bb908ac989d
diff --cc lib/libzpool/kernel.c
index 18420719b,89108fe5b..34dfc77c5
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -34,7 -34,9 +34,8 @@@
  #include <sys/stat.h>
  #include <sys/processor.h>
  #include <sys/zfs_context.h>
 -#include <sys/zmod.h>
  #include <sys/utsname.h>
+ #include <sys/systeminfo.h>
  
  /*
   * Emulation of kernel services in userland.