git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
setup_32.c
diff --git
a/arch/sparc/kernel/setup_32.c
b/arch/sparc/kernel/setup_32.c
index
d26e1f6
..
3e3e291
100644
(file)
--- a/
arch/sparc/kernel/setup_32.c
+++ b/
arch/sparc/kernel/setup_32.c
@@
-137,7
+137,7
@@
static void __init process_switch(char c)
prom_halt();
break;
case 'p':
- /* Just ignore, this behavior is now the default. */
+ prom_early_console.flags &= ~CON_BOOT;
break;
default:
printk("Unknown boot switch (-%c)\n", c);