Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / include / linux / swab.h

diff --git a/include/linux/swab.h b/include/linux/swab.h
index 9a2d33e0a98abeb5f8550e4d960549c8dd21ce57..ea0c02fd5163c2b865d2041cc0a2f5e43e7c7743 100644 (file)
--- a/include/linux/swab.h
+++ b/include/linux/swab.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/compiler.h>
-#include <asm/byteorder.h>
+#include <asm/swab.h>
 
 /*
  * casts are necessary for constants, because we never know how for sure
@@ -68,7 +68,7 @@ static inline __attribute_const__ __u64 __fswab64(__u64 val)
 #elif defined(__SWAB_64_THRU_32__)
        __u32 h = val >> 32;
        __u32 l = val & ((1ULL << 32) - 1);
-       return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h)));
+       return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
 #else
        return ___constant_swab64(val);
 #endif