diff --git a/[refs] b/[refs]
index bc0b004f9902..8398d56df7aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 493e3758be1d5628b4d799fe21d68969edbe32aa
+refs/heads/master: b2670eacfb013169b8bf151a5078a9ef8ef86466
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index 50fb89e3d95d..5ac1f2963ae3 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -1,3 +1,8 @@
+config DEFCONFIG_LIST
+	string
+	option defconfig_list
+	default "arch/$ARCH/defconfig"
+
 # UML uses the generic IRQ sugsystem
 config GENERIC_HARDIRQS
 	bool
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 10382931eead..c8b2624af176 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -1,5 +1,6 @@
 config DEFCONFIG_LIST
 	string
+	depends on !UML
 	option defconfig_list
 	default "/lib/modules/$UNAME_RELEASE/.config"
 	default "/etc/kernel-config"