Merge tag 'nfsd-5.1' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / include / media / rc-map.h

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index d621acadfbf361c2ae86cc6872e18fe8d1fbb5a7..5e684bb0d64c4043b9c626c30eaad8f938f618cf 100644 (file)
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -37,6 +37,9 @@
 #define RC_PROTO_BIT_XMP               BIT_ULL(RC_PROTO_XMP)
 #define RC_PROTO_BIT_CEC               BIT_ULL(RC_PROTO_CEC)
 #define RC_PROTO_BIT_IMON              BIT_ULL(RC_PROTO_IMON)
+#define RC_PROTO_BIT_RCMM12            BIT_ULL(RC_PROTO_RCMM12)
+#define RC_PROTO_BIT_RCMM24            BIT_ULL(RC_PROTO_RCMM24)
+#define RC_PROTO_BIT_RCMM32            BIT_ULL(RC_PROTO_RCMM32)
 
 #define RC_PROTO_BIT_ALL \
                        (RC_PROTO_BIT_UNKNOWN | RC_PROTO_BIT_OTHER | \
@@ -51,7 +54,8 @@
                         RC_PROTO_BIT_RC6_6A_24 | RC_PROTO_BIT_RC6_6A_32 | \
                         RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
                         RC_PROTO_BIT_XMP | RC_PROTO_BIT_CEC | \
-                        RC_PROTO_BIT_IMON)
+                        RC_PROTO_BIT_IMON | RC_PROTO_BIT_RCMM12 | \
+                        RC_PROTO_BIT_RCMM24 | RC_PROTO_BIT_RCMM32)
 /* All rc protocols for which we have decoders */
 #define RC_PROTO_BIT_ALL_IR_DECODER \
                        (RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
@@ -64,7 +68,9 @@
                         RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
                         RC_PROTO_BIT_RC6_6A_24 |  RC_PROTO_BIT_RC6_6A_32 | \
                         RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
-                        RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON)
+                        RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON | \
+                        RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
+                        RC_PROTO_BIT_RCMM32)
 
 #define RC_PROTO_BIT_ALL_IR_ENCODER \
                        (RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
@@ -77,7 +83,9 @@
                         RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
                         RC_PROTO_BIT_RC6_6A_24 | \
                         RC_PROTO_BIT_RC6_6A_32 | RC_PROTO_BIT_RC6_MCE | \
-                        RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON)
+                        RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON | \
+                        RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
+                        RC_PROTO_BIT_RCMM32)
 
 #define RC_SCANCODE_UNKNOWN(x)                 (x)
 #define RC_SCANCODE_OTHER(x)                   (x)
@@ -136,14 +144,14 @@ struct rc_map_list {
 /* Routines from rc-map.c */
 
 /**
- * rc_map_register() - Registers a Remote Controler scancode map
+ * rc_map_register() - Registers a Remote Controller scancode map
  *
  * @map:       pointer to struct rc_map_list
  */
 int rc_map_register(struct rc_map_list *map);
 
 /**
- * rc_map_unregister() - Unregisters a Remote Controler scancode map
+ * rc_map_unregister() - Unregisters a Remote Controller scancode map
  *
  * @map:       pointer to struct rc_map_list
  */