projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
byteorder.h
diff --git
a/arch/arm/include/asm/byteorder.h
b/arch/arm/include/asm/byteorder.h
index 71a9966301d05ed366b9d89f25dcdd63af7ca8a2..20cce7657e1059a170fd5ef32688cb96064fcd7f 100644
(file)
--- a/
arch/arm/include/asm/byteorder.h
+++ b/
arch/arm/include/asm/byteorder.h
@@
-23,22
+23,10
@@
# define __SWAB_64_THRU_32__
#endif
# define __SWAB_64_THRU_32__
#endif
-#ifdef CONFIG_ARM64
-
-#ifdef __AARCH64EB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
-
-#else /* CONFIG_ARM64 */
-
-#ifdef __ARMEB__
+#if defined(__ARMEB__) || defined(__AARCH64EB__)
#include <linux/byteorder/big_endian.h>
#else
#include <linux/byteorder/little_endian.h>
#endif
#include <linux/byteorder/big_endian.h>
#else
#include <linux/byteorder/little_endian.h>
#endif
-#endif /* CONFIG_ARM64 */
-
#endif
#endif