Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / parisc / include / uapi / asm / swab.h

diff --git a/arch/parisc/include/uapi/asm/swab.h b/arch/parisc/include/uapi/asm/swab.h
index e78403b129ef927361032c8c92c5e3c82e830941..928e1bbac98fef4fa098163d12a98670000065d2 100644 (file)
--- a/arch/parisc/include/uapi/asm/swab.h
+++ b/arch/parisc/include/uapi/asm/swab.h
@@ -1,6 +1,7 @@
 #ifndef _PARISC_SWAB_H
 #define _PARISC_SWAB_H
 
 #ifndef _PARISC_SWAB_H
 #define _PARISC_SWAB_H
 

+#include <asm/bitsperlong.h>

 #include <linux/types.h>
 #include <linux/compiler.h>
 
 #include <linux/types.h>
 #include <linux/compiler.h>
 


@@ -38,7 +39,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 }
 #define __arch_swab32 __arch_swab32
 
 }
 #define __arch_swab32 __arch_swab32
 

-#if BITS_PER_LONG > 32
+#if __BITS_PER_LONG > 32

 /*
 ** From "PA-RISC 2.0 Architecture", HP Professional Books.
 ** See Appendix I page 8 , "Endian Byte Swapping".
 /*
 ** From "PA-RISC 2.0 Architecture", HP Professional Books.
 ** See Appendix I page 8 , "Endian Byte Swapping".


@@ -61,6 +62,6 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
        return x;
 }
 #define __arch_swab64 __arch_swab64
        return x;
 }
 #define __arch_swab64 __arch_swab64

-#endif /* BITS_PER_LONG > 32 */
+#endif /* __BITS_PER_LONG > 32 */

 
 #endif /* _PARISC_SWAB_H */
 
 #endif /* _PARISC_SWAB_H */