diff --git a/[refs] b/[refs]
index 2aad4b12dee6..ef7418f5682e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e414004e94b5aebf57ca11be009fed5e39f5b6a8
+refs/heads/master: 6920df4025b426cb3c9756944a965fe9ccb30925
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index d60bbbb953f0..12bf96334174 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -1585,15 +1585,6 @@ config CPU_HAS_SMARTMIPS
 config CPU_HAS_WB
 	bool
 
-config 64BIT_CONTEXT
-	bool "Save 64bit integer registers"
-	depends on 32BIT && CPU_LOONGSON2
-	help
-	  Loongson2 CPU is 64bit , when used in 32BIT mode, its integer
-	  registers can still be accessed as 64bit, mainly for multimedia
-	  instructions. We must have all 64bit save/restored to make sure
-	  those instructions to get correct result.
-
 #
 # Vectored interrupt mode is an R2 feature
 #