diff --git a/[refs] b/[refs] index 68561dc6cadf..6d69c4dd6f8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0e13ae76a607eab9c387544ebca550f2196a876 +refs/heads/master: 786142fab86cfddd3e7797e9ccf8a8a3bcaf0456 diff --git a/trunk/arch/x86_64/kernel/early_printk.c b/trunk/arch/x86_64/kernel/early_printk.c index b7aa9abe1c6a..92213d2b7c11 100644 --- a/trunk/arch/x86_64/kernel/early_printk.c +++ b/trunk/arch/x86_64/kernel/early_printk.c @@ -175,7 +175,7 @@ static noinline long simnow(long cmd, long a, long b, long c) return ret; } -void __init simnow_init(char *str) +static void __init simnow_init(char *str) { char *fn = "klog"; if (*str == '=')