diff --git a/[refs] b/[refs]
index 1494114d8784..51fc89928e7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bc6d05b481aa7dc79c81b8ffac0da755e149643
+refs/heads/master: f839490ab42a471f0b0a4b795df77a1af924fe05
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 71e8ebd8ed0b..600eef3f3ac7 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -1365,7 +1365,7 @@ config CPU_SUPPORTS_64BIT_KERNEL
 #
 config HARDWARE_WATCHPOINTS
        bool
-       default y if CPU_MIPS32 || CPU_MIPS64
+       default y if CPU_MIPSR1 || CPU_MIPSR2
 
 menu "Kernel type"