From 4a1a0153c347f378ee9c43527ca8233bcd21ee1c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Nov 2010 23:52:56 +0100
Subject: [PATCH] 	* include/grub/emu/misc.h: Don't include
 grub/util/libzfs.h. 	* include/grub/emu/misc.h (grub_get_libzfs_handle):
 Move from here ... 	* include/grub/util/libzfs.h (grub_get_libzfs_handle):
 ... here.

---
 ChangeLog                  | 6 ++++++
 include/grub/emu/misc.h    | 3 ---
 include/grub/util/libzfs.h | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24ef00f8d..e7ffe6403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/emu/misc.h: Don't include grub/util/libzfs.h.
+	* include/grub/emu/misc.h (grub_get_libzfs_handle): Move from here ...
+	* include/grub/util/libzfs.h (grub_get_libzfs_handle): ... here.
+
 2010-11-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/ntfs.c (grub_ntfs_uuid): Make uppercase.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 47a80d3d7..ef0d18300 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -24,7 +24,6 @@
 
 #include <grub/symbol.h>
 #include <grub/types.h>
-#include <grub/util/libzfs.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
@@ -79,6 +78,4 @@ extern char * canonicalize_file_name (const char *path);
 int grub_device_mapper_supported (void);
 #endif
 
-libzfs_handle_t *grub_get_libzfs_handle (void);
-
 #endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/util/libzfs.h b/include/grub/util/libzfs.h
index 0500f70d7..a02caa335 100644
--- a/include/grub/util/libzfs.h
+++ b/include/grub/util/libzfs.h
@@ -42,4 +42,6 @@ extern nvlist_t *zpool_get_config (zpool_handle_t *, nvlist_t **);
 
 #endif /* ! HAVE_LIBZFS_H */
 
+libzfs_handle_t *grub_get_libzfs_handle (void);
+
 #endif