Pull release into acpica branch

1 files changed, 2 insertions, 0 deletions

diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h
index 95944556d8b6..d0d76b30eb4c 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,
 };