diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:13:50 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:34 -0400 |
| commit | b8c655d727ebfe78769b62a0349227d5a656e967 (patch) | |
| tree | 48a8ed295dc5cec26cfb9b33e3fd2793d29c4c12 | |
| parent | 46ecca8ae1540abe73000d0fb4878de6956a208f (diff) | |
um: generic ftrace.h will do...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/um/include/asm/ftrace.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 5962826ac205..451f4517b334 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h | 1 | generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h |
| 2 | generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h | 2 | generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h |
| 3 | generic-y += ftrace.h | ||
diff --git a/arch/um/include/asm/ftrace.h b/arch/um/include/asm/ftrace.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/um/include/asm/ftrace.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | /* empty */ | ||