diff --git a/[refs] b/[refs]
index cd137c39aad6..e4c440e65a4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ad7b7d3cd7883810c05fad9d30303cf9368f63
+refs/heads/master: e20368d5dffcfd7a2bc1749627e97e99ec4e6a77
diff --git a/trunk/include/asm-mips/mipsregs.h b/trunk/include/asm-mips/mipsregs.h
index dd494cae4a44..2a56929df9c2 100644
--- a/trunk/include/asm-mips/mipsregs.h
+++ b/trunk/include/asm-mips/mipsregs.h
@@ -425,7 +425,6 @@
 #define CONF_SM			(_ULCAST_(1) << 16)
 #define CONF_SC			(_ULCAST_(1) << 17)
 #define CONF_EW			(_ULCAST_(3) << 18)
-#define CONF_SB			(_ULCAST_(3) << 22)
 #define CONF_EP			(_ULCAST_(15)<< 24)
 #define CONF_EC			(_ULCAST_(7) << 28)
 #define CONF_CM			(_ULCAST_(1) << 31)
@@ -433,6 +432,7 @@
 /* Bits specific to the R4xx0.  */
 #define R4K_CONF_SW		(_ULCAST_(1) << 20)
 #define R4K_CONF_SS		(_ULCAST_(1) << 21)
+#define R4K_CONF_SB		(_ULCAST_(3) << 22)
 
 /* Bits specific to the R5000.  */
 #define R5K_CONF_SE		(_ULCAST_(1) << 12)