Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

[oweals/u-boot.git] / include / linux / byteorder / swab.h

diff --git a/include/linux/byteorder/swab.h b/include/linux/byteorder/swab.h
index b1d570e528ef9215ce9b9d76e8cc20fbb677d380..4334fa77e3f6469f7f4d555e0407a4de98c30670 100644 (file)
--- a/include/linux/byteorder/swab.h
+++ b/include/linux/byteorder/swab.h
@@ -100,7 +100,7 @@ static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x)
 {
        return __arch__swab16(x);
 }
-static __inline__ __u16 __swab16p(__u16 *x)
+static __inline__ __u16 __swab16p(const __u16 *x)
 {
        return __arch__swab16p(x);
 }
@@ -113,7 +113,7 @@ static __inline__ __attribute__((const)) __u32 __fswab32(__u32 x)
 {
        return __arch__swab32(x);
 }
-static __inline__ __u32 __swab32p(__u32 *x)
+static __inline__ __u32 __swab32p(const __u32 *x)
 {
        return __arch__swab32p(x);
 }
@@ -122,7 +122,6 @@ static __inline__ void __swab32s(__u32 *addr)
        __arch__swab32s(addr);
 }
 
-#ifdef __BYTEORDER_HAS_U64__
 static __inline__ __attribute__((const)) __u64 __fswab64(__u64 x)
 {
 #  ifdef __SWAB_64_THRU_32__
@@ -133,7 +132,7 @@ static __inline__ __attribute__((const)) __u64 __fswab64(__u64 x)
        return __arch__swab64(x);
 #  endif
 }
-static __inline__ __u64 __swab64p(__u64 *x)
+static __inline__ __u64 __swab64p(const __u64 *x)
 {
        return __arch__swab64p(x);
 }
@@ -141,7 +140,6 @@ static __inline__ void __swab64s(__u64 *addr)
 {
        __arch__swab64s(addr);
 }
-#endif /* __BYTEORDER_HAS_U64__ */
 
 #if defined(__KERNEL__)
 #define swab16 __swab16