diff --git a/README.chromium b/README.chromium
index f09c1c099..fc9928645 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 420
+Version: 421
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 2df08ed56..c7c9519e0 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 420
+#define LIBYUV_VERSION 421
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index b5d6a26f3..a75739cbe 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -118,6 +118,7 @@ int ArmCpuCaps(const char* cpuinfo_name) {
   return 0;
 }
 
+#if defined(__mips__) && defined(__linux__)
 static int MipsCpuCaps(const char* search_string) {
   const char* file_name = "/proc/cpuinfo";
   char cpuinfo_line[256];
@@ -134,6 +135,7 @@ static int MipsCpuCaps(const char* search_string) {
   /* Did not find string in the proc file, or not Linux ELF. */
   return 0;
 }
+#endif
 
 // CPU detect function for SIMD instruction sets.
 // TODO(fbarchard): Use constant if/when valgrind says cpu_info is initialized.
diff --git a/unit_test/rotate_test.cc b/unit_test/rotate_test.cc
index 054f168f5..8e6140320 100644
--- a/unit_test/rotate_test.cc
+++ b/unit_test/rotate_test.cc
@@ -1640,4 +1640,5 @@ TEST_F(libyuvTest, NV12ToI420SplitUV) {
 
   EXPECT_EQ(0, err);
 }
+
 }  // namespace libyuv