diff --git a/[refs] b/[refs]
index ab232e8ccf57..09f2bb86d583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46ecca8ae1540abe73000d0fb4878de6956a208f
+refs/heads/master: b8c655d727ebfe78769b62a0349227d5a656e967
diff --git a/trunk/arch/um/include/asm/Kbuild b/trunk/arch/um/include/asm/Kbuild
index 5962826ac205..451f4517b334 100644
--- a/trunk/arch/um/include/asm/Kbuild
+++ b/trunk/arch/um/include/asm/Kbuild
@@ -1,2 +1,3 @@
 generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
 generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
+generic-y += ftrace.h
diff --git a/trunk/arch/um/include/asm/ftrace.h b/trunk/arch/um/include/asm/ftrace.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/trunk/arch/um/include/asm/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */