git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
sni
/
setup.c
diff --git
a/arch/mips/sni/setup.c
b/arch/mips/sni/setup.c
index a49272ce7ef510e2f61a4a3f4f1f312186da4164..d16b462154c33834f996bc0e89726ae97a83b089 100644
(file)
--- a/
arch/mips/sni/setup.c
+++ b/
arch/mips/sni/setup.c
@@
-60,7
+60,7
@@
static void __init sni_console_setup(void)
char *cdev;
char *baud;
int port;
- static char options[8];
+ static char options[8]
__initdata
;
cdev = prom_getenv("console_dev");
if (strncmp(cdev, "tty", 3) == 0) {