Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

[karo-tx-linux.git] / include / linux / compiler-intel.h

diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index b769961e6f2371090a1bfe94b751afc4ab0306b7..973ce10c40b651faa5d9e06f41eb49fefa492eab 100644 (file)
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -1,4 +1,6 @@
-/* Never include this file directly.  Include <linux/compiler.h> instead.  */
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead."
+#endif
 
 #ifdef __ECC
 
@@ -27,3 +29,10 @@
 #endif
 
 #define uninitialized_var(x) x
+
+#ifndef __HAVE_BUILTIN_BSWAP16__
+/* icc has this, but it's called _bswap16 */
+#define __HAVE_BUILTIN_BSWAP16__
+#define __builtin_bswap16 _bswap16
+#endif
+