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 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
prom
/
init_64.c
diff --git
a/arch/sparc/prom/init_64.c
b/arch/sparc/prom/init_64.c
index
200528b
..
5016c5e
100644
(file)
--- a/
arch/sparc/prom/init_64.c
+++ b/
arch/sparc/prom/init_64.c
@@
-18,7
+18,7
@@
char prom_version[80];
/* The root node of the prom device tree. */
char prom_version[80];
/* The root node of the prom device tree. */
-int prom_std
in, prom_std
out;
+int prom_stdout;
phandle prom_chosen_node;
/* You must call prom_init() before you attempt to use any of the
phandle prom_chosen_node;
/* You must call prom_init() before you attempt to use any of the
@@
-38,7
+38,6
@@
void __init prom_init(void *cif_handler, void *cif_stack)
if (!prom_chosen_node || (s32)prom_chosen_node == -1)
prom_halt();
if (!prom_chosen_node || (s32)prom_chosen_node == -1)
prom_halt();
- prom_stdin = prom_getint(prom_chosen_node, "stdin");
prom_stdout = prom_getint(prom_chosen_node, "stdout");
node = prom_finddevice("/openprom");
prom_stdout = prom_getint(prom_chosen_node, "stdout");
node = prom_finddevice("/openprom");