Merge commit 'v2.6.29-rc1' into x86/urgent

[pandora-kernel.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index e651ab0..7015733 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -619,7 +619,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu)
 static const char recursion_bug_msg [] =
                KERN_CRIT "BUG: recent printk recursion!\n";
 static int recursion_bug;
-       static int new_text_line = 1;
+static int new_text_line = 1;
 static char printk_buf[1024];
 
 asmlinkage int vprintk(const char *fmt, va_list args)