OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab7f6f3
)
MIPS: Sibyte: Fix build error if CONFIG_SERIAL_SB1250_DUART is undefined.
author
Ralf Baechle
<ralf@linux-mips.org>
Mon, 22 Jun 2009 15:17:52 +0000
(16:17 +0100)
committer
Ralf Baechle
<ralf@linux-mips.org>
Wed, 24 Jun 2009 17:34:39 +0000
(18:34 +0100)
This fixes kernel.org bugzilla 13596, see
http://bugzilla.kernel.org/show_bug.cgi?id=13596
Reported-by: dvice_null@yahoo.com
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/sibyte/common/cfe_console.c
patch
|
blob
|
history
diff --git
a/arch/mips/sibyte/common/cfe_console.c
b/arch/mips/sibyte/common/cfe_console.c
index
81e3d54
..
1ad2da1
100644
(file)
--- a/
arch/mips/sibyte/common/cfe_console.c
+++ b/
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;