diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:34:37 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 78795d7a2a52afca3e80ecb94ca4022ce2364bf6 (patch) | |
| tree | fcc1f825bd3f7072940742ef2844ce6ec10a1ddd /kernel | |
| parent | 2ccc36d2174def2f877f4c063641d406d88e1737 (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> |