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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
sparc64
/
prom
/
misc.c
diff --git
a/arch/sparc64/prom/misc.c
b/arch/sparc64/prom/misc.c
index
33c5b7d
..
68c83ad
100644
(file)
--- a/
arch/sparc64/prom/misc.c
+++ b/
arch/sparc64/prom/misc.c
@@
-72,7
+72,7
@@
void prom_cmdline(void)
local_irq_save(flags);
- if (
!serial_console &&
prom_palette)
+ if (prom_palette)
prom_palette(1);
#ifdef CONFIG_SMP
@@
-85,7
+85,7
@@
void prom_cmdline(void)
smp_release();
#endif
- if (
!serial_console &&
prom_palette)
+ if (prom_palette)
prom_palette(0);
local_irq_restore(flags);