diff --git a/[refs] b/[refs]
index acff601d9f90..2df460d2087c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99a10a60ba9bedcf5d70ef81414d3e03816afa3f
+refs/heads/master: 1b95817dd76084c10cb8dc899f429bcc85454741
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 8fd2dbf7eb5b..77491e311791 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -373,6 +373,7 @@ config FORCED_INLINING
 
 config HEADERS_CHECK
 	bool "Run 'make headers_check' when building vmlinux"
+	depends on !UML
 	help
 	  This option will extract the user-visible kernel headers whenever
 	  building the kernel, and will run basic sanity checks on them to