diff --git a/[refs] b/[refs]
index a3c141efbdde..2f6720dcec46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8155c02a44a95562e1ae0999360eb31288d7195a
+refs/heads/master: 674dff6507d3f9b110219ea125cf5e1213c9acef
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 6ff26151f4ff..b2ebaee8c377 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -210,7 +210,7 @@ __setup("log_buf_len=", log_buf_len_setup);
 
 #ifdef CONFIG_BOOT_PRINTK_DELAY
 
-static unsigned int boot_delay; /* msecs delay after each printk during bootup */
+static int boot_delay; /* msecs delay after each printk during bootup */
 static unsigned long long loops_per_msec;	/* based on boot_delay */
 
 static int __init boot_delay_setup(char *str)