From d5169c84e09681c498862c847e503cc6adce4ad4 Mon Sep 17 00:00:00 2001
From: Robert Marklund <robert.marklund@stericsson.com>
Date: Thu, 23 Jun 2011 13:34:37 +0200
Subject: Fix merge problems maybe remove the fixes in this file ?

Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
---
 kernel/printk.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'kernel')

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>
-- 
cgit v1.2.3