diff --git a/[refs] b/[refs]
index c8584b202851..50f305c23113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16b7c5737d2c46c8772ca11ac219273362a9a29e
+refs/heads/master: c16d56a37ac6889ae9b199c02e76a03ec8a8c419
diff --git a/trunk/arch/um/include/asm/checksum.h b/trunk/arch/um/include/asm/checksum.h
deleted file mode 100644
index 5b501361e361..000000000000
--- a/trunk/arch/um/include/asm/checksum.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_CHECKSUM_H
-#define __UM_CHECKSUM_H
-
-#include "sysdep/checksum.h"
-
-#endif
diff --git a/trunk/arch/um/sys-i386/shared/sysdep/checksum.h b/trunk/arch/um/sys-i386/asm/checksum.h
similarity index 99%
rename from trunk/arch/um/sys-i386/shared/sysdep/checksum.h
rename to trunk/arch/um/sys-i386/asm/checksum.h
index ed47445f3905..caab74252e27 100644
--- a/trunk/arch/um/sys-i386/shared/sysdep/checksum.h
+++ b/trunk/arch/um/sys-i386/asm/checksum.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed under the GPL
  */
 
diff --git a/trunk/arch/um/sys-x86_64/shared/sysdep/checksum.h b/trunk/arch/um/sys-x86_64/asm/checksum.h
similarity index 100%
rename from trunk/arch/um/sys-x86_64/shared/sysdep/checksum.h
rename to trunk/arch/um/sys-x86_64/asm/checksum.h