diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:34:37 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:50:54 +0200 |
| commit | d5169c84e09681c498862c847e503cc6adce4ad4 (patch) | |
| tree | 2b2642fbe7b768bc34e70ee7e3ba5c08e1abeb6d /kernel | |
| parent | 4e5176a567166769c29a39f66959b81efae11e47 (diff) | |
Fix merge problems maybe remove the fixes in this file ?
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 2918e7287ab..4e138caf6c4 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -41,7 +41,6 @@ #include <linux/cpu.h> #include <linux/notifier.h> #include <linux/rculist.h> -#include <trace/kernel.h> #include <trace/stm.h> #include <asm/uaccess.h> |