* 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.

diff --git a/ChangeLog b/ChangeLog
index 24ef00f8df9643514ad38aa2b0f3bfa9b597f5fd..e7ffe6403e4693705ce3023ce79f4f23a9b2e37d 100644 (file)
--- 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 47a80d3d7840ca20cafb0ac88560d2751ed37cfe..ef0d18300b625843a4d5d6fac3c54cb299c7423e 100644 (file)
--- 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 0500f70d7833fadcc9376d7d12c2d6decb9b9993..a02caa335834d1da612c4931698c724766cf7742 100644 (file)
--- 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