From 40427a1314a8dca14dd4399481e06c288565e29d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:13:50 +0100 Subject: [PATCH] --- yaml --- r: 273059 b: refs/heads/master c: b8c655d727ebfe78769b62a0349227d5a656e967 h: refs/heads/master i: 273057: ecfaa6e101e144358db3d3453811ce4ecff6f5b7 273055: 0887b3ade61813d0822f5f1a096c5ceeb6b4c9f4 v: v3 --- [refs] | 2 +- trunk/arch/um/include/asm/Kbuild | 1 + trunk/arch/um/include/asm/ftrace.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 trunk/arch/um/include/asm/ftrace.h 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 */