diff --git a/[refs] b/[refs]
index 5d2b700ddd0c..6375d1ec8031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00361683ce562402a189362f43370a459b166645
+refs/heads/master: dd768c56da44f6c06486da3b33b41e9c13e985c5
diff --git a/trunk/arch/um/include/asm/system.h b/trunk/arch/um/include/asm/system-um.h
similarity index 96%
rename from trunk/arch/um/include/asm/system.h
rename to trunk/arch/um/include/asm/system-um.h
index 68a90ecd1450..0eec24579288 100644
--- a/trunk/arch/um/include/asm/system.h
+++ b/trunk/arch/um/include/asm/system-um.h
@@ -1,8 +1,6 @@
 #ifndef __UM_SYSTEM_GENERIC_H
 #define __UM_SYSTEM_GENERIC_H
 
-#include "sysdep/system.h"
-
 extern int get_signals(void);
 extern int set_signals(int enable);
 extern void block_signals(void);
diff --git a/trunk/arch/um/sys-x86/shared/sysdep/system.h b/trunk/arch/um/sys-x86/asm/system.h
similarity index 99%
rename from trunk/arch/um/sys-x86/shared/sysdep/system.h
rename to trunk/arch/um/sys-x86/asm/system.h
index d1b93c436200..a89113bc74f2 100644
--- a/trunk/arch/um/sys-x86/shared/sysdep/system.h
+++ b/trunk/arch/um/sys-x86/asm/system.h
@@ -6,6 +6,7 @@
 #include <asm/cpufeature.h>
 #include <asm/cmpxchg.h>
 #include <asm/nops.h>
+#include <asm/system-um.h>
 
 #include <linux/kernel.h>
 #include <linux/irqflags.h>