diff --git a/[refs] b/[refs] index 9f145a210382..76cf07088a16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72480ef863740c3dc301b0803c9ed6d10716aa11 +refs/heads/master: 45fed46f5b98aaf439e9ef125992ec853cd98499 diff --git a/trunk/arch/ppc/kernel/setup.c b/trunk/arch/ppc/kernel/setup.c index 309797d7f96d..5c20266e3b1f 100644 --- a/trunk/arch/ppc/kernel/setup.c +++ b/trunk/arch/ppc/kernel/setup.c @@ -499,7 +499,7 @@ static int __init set_preferred_console(void) { struct device_node *prom_stdout; char *name; - int offset; + int offset = 0; if (of_stdout_device == NULL) return -ENODEV;