From 4c741b2f9dbcce4c72c38bab7501b94786187024 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 5 Jan 2009 15:40:56 -0800
Subject: [PATCH] Revert changes and resolve include issue by adjusting include
 path ordering

---
 module/unicode/u8_textprep.c | 2 +-
 module/unicode/uconv.c       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 93b8f0ba65..72299b51f3 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -45,11 +45,11 @@
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #else
+#include <sys/u8_textprep.h>
 #include <strings.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
-#include <sys/u8_textprep.h>
 #include <sys/u8_textprep_data.h>
 
 
diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c
index e3aee2acab..a9fa9cf33a 100644
--- a/module/unicode/uconv.c
+++ b/module/unicode/uconv.c
@@ -42,10 +42,11 @@
 #include <sys/debug.h>
 #include <sys/kmem.h>
 #include <sys/sunddi.h>
+#else
+#include <sys/u8_textprep.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
-#include <sys/u8_textprep.h>
 
 
 /*