diff --git a/[refs] b/[refs]
index 12c30ba079b2..7000e2948f2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95
+refs/heads/master: a648bd0c9f613d8f9954eccff6009ecfb26e2722
diff --git a/trunk/include/linux/patchkey.h b/trunk/include/linux/patchkey.h
index d974a6e92372..aefda0ec6e62 100644
--- a/trunk/include/linux/patchkey.h
+++ b/trunk/include/linux/patchkey.h
@@ -32,7 +32,8 @@
 #  else
 #    error "could not determine byte order"
 #  endif
-#elif defined(__BYTE_ORDER)
+#else
+#if defined(__BYTE_ORDER)
 #  if __BYTE_ORDER == __BIG_ENDIAN
 #    define _PATCHKEY(id) (0xfd00|id)
 #  elif __BYTE_ORDER == __LITTLE_ENDIAN
@@ -41,5 +42,6 @@
 #    error "could not determine byte order"
 #  endif
 #endif
+#endif
 
 #endif /* _LINUX_PATCHKEY_H */