diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:17:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:17:38 -0800 |
commit | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (patch) | |
tree | c6eeee5cda3a0516a63ccc5e08d5d3855b957122 /include/asm-sparc/oplib.h | |
parent | 497992917edf03994088ec8757b8262e1d9f568a (diff) | |
parent | 2d7d5f05111a9d913131a2764d8b20157f8f758d (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/oplib.h')
-rw-r--r-- | include/asm-sparc/oplib.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h index 95944556d8b..d0d76b30eb4 100644 --- a/include/asm-sparc/oplib.h +++ b/include/asm-sparc/oplib.h @@ -164,6 +164,7 @@ enum prom_input_device { PROMDEV_IKBD, /* input from keyboard */ PROMDEV_ITTYA, /* input from ttya */ PROMDEV_ITTYB, /* input from ttyb */ + PROMDEV_IRSC, /* input from rsc */ PROMDEV_I_UNK, }; @@ -175,6 +176,7 @@ enum prom_output_device { PROMDEV_OSCREEN, /* to screen */ PROMDEV_OTTYA, /* to ttya */ PROMDEV_OTTYB, /* to ttyb */ + PROMDEV_ORSC, /* to rsc */ PROMDEV_O_UNK, }; |