diff --git a/[refs] b/[refs]
index 5b9af775a953..e95c01d2f0b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6295150b732085989e170d2034b84b6ddff6c19e
+refs/heads/master: 2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index b7dc39c6c849..2ac626ab9d43 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -39,8 +39,8 @@ config MIPS
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CMOS_UPDATE
 	select HAVE_MOD_ARCH_SPECIFIC
-	select MODULES_USE_ELF_REL
-	select MODULES_USE_ELF_RELA if 64BIT
+	select MODULES_USE_ELF_REL if MODULES
+	select MODULES_USE_ELF_RELA if MODULES && 64BIT
 
 menu "Machine selection"