summaryrefslogtreecommitdiff
path: root/scripts/sortextable.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-29 13:39:43 -0700
committerOlof Johansson <olof@lixom.net>2014-05-29 13:39:43 -0700
commit8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch)
tree58b31d3d9514df93974216f190824d73f9816d9f /scripts/sortextable.c
parent263c08af44741697202b85e631a964ee85200eb0 (diff)
parent4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff)
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'scripts/sortextable.c')
-rw-r--r--scripts/sortextable.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index cc49062acdee..1052d4834a44 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -35,6 +35,10 @@
#define EM_ARCOMPACT 93
#endif
+#ifndef EM_XTENSA
+#define EM_XTENSA 94
+#endif
+
#ifndef EM_AARCH64
#define EM_AARCH64 183
#endif
@@ -281,6 +285,7 @@ do_file(char const *const fname)
case EM_AARCH64:
case EM_MICROBLAZE:
case EM_MIPS:
+ case EM_XTENSA:
break;
} /* end switch */