MIPS: Octeon: Fix build errors using clang

[sfrench/cifs-2.6.git] / arch / mips / include / asm / octeon / cvmx-bootinfo.h

diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 0e6bf220db618c396e588b91516eb27b39d1c51f..6c61e0a63924918a5728431d05fa9b5b8a03af8f 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -318,7 +318,7 @@ enum cvmx_chip_types_enum {
 
 /* Functions to return string based on type */
 #define ENUM_BRD_TYPE_CASE(x) \
-       case x: return(#x + 16);        /* Skip CVMX_BOARD_TYPE_ */
+       case x: return (&#x[16]);       /* Skip CVMX_BOARD_TYPE_ */
 static inline const char *cvmx_board_type_to_string(enum
                                                    cvmx_board_types_enum type)
 {
@@ -410,7 +410,7 @@ static inline const char *cvmx_board_type_to_string(enum
 }
 
 #define ENUM_CHIP_TYPE_CASE(x) \
-       case x: return(#x + 15);        /* Skip CVMX_CHIP_TYPE */
+       case x: return (&#x[15]);       /* Skip CVMX_CHIP_TYPE */
 static inline const char *cvmx_chip_type_to_string(enum
                                                   cvmx_chip_types_enum type)
 {