diff --git a/[refs] b/[refs]
index 77de1a03af83..17f024d2aeb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 404571525db92bafeddb0cf9febb21aac6613dca
+refs/heads/master: 8f808417fe211648c0816e28947cdc74eb1e1032
diff --git a/trunk/arch/cris/Makefile b/trunk/arch/cris/Makefile
index 838cd2ae03ae..c6f5f5a2ffdf 100644
--- a/trunk/arch/cris/Makefile
+++ b/trunk/arch/cris/Makefile
@@ -10,6 +10,8 @@
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
 
+KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig
+
 arch-y := v10
 arch-$(CONFIG_ETRAX_ARCH_V10) := v10
 arch-$(CONFIG_ETRAX_ARCH_V32) := v32
diff --git a/trunk/arch/cris/artpec_3_defconfig b/trunk/arch/cris/configs/artpec_3_defconfig
similarity index 100%
rename from trunk/arch/cris/artpec_3_defconfig
rename to trunk/arch/cris/configs/artpec_3_defconfig
diff --git a/trunk/arch/cris/arch-v10/defconfig b/trunk/arch/cris/configs/etrax-100lx_defconfig
similarity index 100%
rename from trunk/arch/cris/arch-v10/defconfig
rename to trunk/arch/cris/configs/etrax-100lx_defconfig
diff --git a/trunk/arch/cris/defconfig b/trunk/arch/cris/configs/etrax-100lx_v2_defconfig
similarity index 100%
rename from trunk/arch/cris/defconfig
rename to trunk/arch/cris/configs/etrax-100lx_v2_defconfig
diff --git a/trunk/arch/cris/etraxfs_defconfig b/trunk/arch/cris/configs/etraxfs_defconfig
similarity index 100%
rename from trunk/arch/cris/etraxfs_defconfig
rename to trunk/arch/cris/configs/etraxfs_defconfig