From 6b706119f1d1d30b1faf51612be52bf70244d5b9 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Tue, 26 Oct 2010 14:22:48 -0700 Subject: [PATCH] --- yaml --- r: 217545 b: refs/heads/master c: 674dff6507d3f9b110219ea125cf5e1213c9acef h: refs/heads/master i: 217543: d80c3a0bf701cb7b08a42dead386ae9d1e3dc0ab v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)