git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-sparc
/
oplib.h
diff --git
a/include/asm-sparc/oplib.h
b/include/asm-sparc/oplib.h
index
e26d070
..
f283f8a
100644
(file)
--- a/
include/asm-sparc/oplib.h
+++ b/
include/asm-sparc/oplib.h
@@
-10,6
+10,7
@@
#include <asm/openprom.h>
#include <linux/spinlock.h>
#include <asm/openprom.h>
#include <linux/spinlock.h>
+#include <linux/compiler.h>
/* The master romvec pointer... */
extern struct linux_romvec *romvec;
/* The master romvec pointer... */
extern struct linux_romvec *romvec;
@@
-163,6
+164,8
@@
enum prom_input_device {
PROMDEV_IKBD, /* input from keyboard */
PROMDEV_ITTYA, /* input from ttya */
PROMDEV_ITTYB, /* input from ttyb */
PROMDEV_IKBD, /* input from keyboard */
PROMDEV_ITTYA, /* input from ttya */
PROMDEV_ITTYB, /* input from ttyb */
+ PROMDEV_IRSC, /* input from rsc */
+ PROMDEV_IVCONS, /* input from virtual-console */
PROMDEV_I_UNK,
};
PROMDEV_I_UNK,
};
@@
-174,6
+177,8
@@
enum prom_output_device {
PROMDEV_OSCREEN, /* to screen */
PROMDEV_OTTYA, /* to ttya */
PROMDEV_OTTYB, /* to ttyb */
PROMDEV_OSCREEN, /* to screen */
PROMDEV_OTTYA, /* to ttya */
PROMDEV_OTTYB, /* to ttyb */
+ PROMDEV_ORSC, /* to rsc */
+ PROMDEV_OVCONS, /* to virtual-console */
PROMDEV_O_UNK,
};
PROMDEV_O_UNK,
};
@@
-244,8
+249,8
@@
extern int prom_getproplen(int thisnode, char *property);
/* Fetch the requested property using the given buffer. Returns
* the number of bytes the prom put into your buffer or -1 on error.
*/
/* Fetch the requested property using the given buffer. Returns
* the number of bytes the prom put into your buffer or -1 on error.
*/
-extern int prom_getproperty(int thisnode, char *property,
- char *prop_buffer, int propbuf_size);
+extern int
__must_check
prom_getproperty(int thisnode, char *property,
+
char *prop_buffer, int propbuf_size);
/* Acquire an integer property. */
extern int prom_getint(int node, char *property);
/* Acquire an integer property. */
extern int prom_getint(int node, char *property);