From 634801fc81bb8b28c4aac2409cf8f0e4b90fe77b Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sun, 9 Nov 2008 18:51:09 -0800
Subject: [PATCH] --- yaml --- r: 126927 b: refs/heads/master c:
 91a15026eb89a687dfcac860a969cfd872f3c94f h: refs/heads/master i:   126925:
 d967cbdfc85386efd72e463f63cdbc501591dac2   126923:
 6da1b468ac0d2360f3ff381186b785742f75dcc3   126919:
 c0c0d5014b417ad56d49be0f74742d4d513cbfca   126911:
 83473a54732f7feae05703b82662a3c749515868 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/xtensa/include/asm/unaligned.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8d42163a2091..5594f9c7ca04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fa5723aa7e053d498336b48448b292fc2e0458b
+refs/heads/master: 91a15026eb89a687dfcac860a969cfd872f3c94f
diff --git a/trunk/arch/xtensa/include/asm/unaligned.h b/trunk/arch/xtensa/include/asm/unaligned.h
index 8f3424fc5d18..8e7ed046bfed 100644
--- a/trunk/arch/xtensa/include/asm/unaligned.h
+++ b/trunk/arch/xtensa/include/asm/unaligned.h
@@ -10,20 +10,20 @@
 #ifndef _ASM_XTENSA_UNALIGNED_H
 #define _ASM_XTENSA_UNALIGNED_H
 
-#ifdef __XTENSA_EL__
-# include <linux/unaligned/le_memmove.h>
+#include <asm/byteorder.h>
+
+#ifdef __LITTLE_ENDIAN
+# include <linux/unaligned/le_struct.h>
 # include <linux/unaligned/be_byteshift.h>
 # include <linux/unaligned/generic.h>
 # define get_unaligned	__get_unaligned_le
 # define put_unaligned	__put_unaligned_le
-#elif defined(__XTENSA_EB__)
-# include <linux/unaligned/be_memmove.h>
+#else
+# include <linux/unaligned/be_struct.h>
 # include <linux/unaligned/le_byteshift.h>
 # include <linux/unaligned/generic.h>
 # define get_unaligned	__get_unaligned_be
 # define put_unaligned	__put_unaligned_be
-#else
-# error processor byte order undefined!
 #endif
 
 #endif	/* _ASM_XTENSA_UNALIGNED_H */