diff --git a/[refs] b/[refs] index 95f4da210b24..e970106ddaf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab7f6f3010a6c5ae147541168705a446cee511e7 +refs/heads/master: 2e25406fb878e2313a9d8e302ed7ff3c2831198f diff --git a/trunk/arch/mips/sibyte/common/cfe_console.c b/trunk/arch/mips/sibyte/common/cfe_console.c index 81e3d54376e9..1ad2da103fe9 100644 --- a/trunk/arch/mips/sibyte/common/cfe_console.c +++ b/trunk/arch/mips/sibyte/common/cfe_console.c @@ -51,12 +51,13 @@ static int cfe_console_setup(struct console *cons, char *str) setleds("u0cn"); } else if (!strcmp(consdev, "uart1")) { setleds("u1cn"); + } else #endif #ifdef CONFIG_VGA_CONSOLE - } else if (!strcmp(consdev, "pcconsole0")) { - setleds("pccn"); -#endif + if (!strcmp(consdev, "pcconsole0")) { + setleds("pccn"); } else +#endif return -ENODEV; } return 0;