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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
oplib_64.h
diff --git
a/arch/sparc/include/asm/oplib_64.h
b/arch/sparc/include/asm/oplib_64.h
index
8cd0df3
..
97a9047
100644
(file)
--- a/
arch/sparc/include/asm/oplib_64.h
+++ b/
arch/sparc/include/asm/oplib_64.h
@@
-18,8
+18,8
@@
extern char prom_version[];
*/
extern phandle prom_root_node;
-/* PROM std
in and std
out */
-extern int prom_std
in, prom_std
out;
+/* PROM stdout */
+extern int prom_stdout;
/* /chosen node of the prom device tree, this stays constant after
* initialization is complete.