diff options
author | 2013-02-21 17:07:14 +0100 | |
---|---|---|
committer | 2013-02-21 17:07:14 +0100 | |
commit | e29371d762df5bb35d2bc434ea266a046e5a0a75 (patch) | |
tree | dac4a8db52d92453415f35606130a49e9f32e4ef /include/linux/compiler-intel.h | |
parent | netfilter: ipset: Fix range bug in hash:ip,port,net (diff) | |
parent | netfilter: nf_ct_reasm: fix per-netns sysctl initialization (diff) | |
download | linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.tar.xz linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.zip |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'include/linux/compiler-intel.h')
-rw-r--r-- | include/linux/compiler-intel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index d8e636e5607d..973ce10c40b6 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -29,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 + |