Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / include / media / rc-map.h

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 11f66182b91fc9a2ab1c9d6798d382025e7f1e31..c78e99a435b6c019438059e84d72a67e55fc2bd8 100644 (file)
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -13,9 +13,10 @@
 
 #define IR_TYPE_UNKNOWN        0
 #define IR_TYPE_RC5    (1  << 0)       /* Philips RC5 protocol */
-#define IR_TYPE_PD     (1  << 1)       /* Pulse distance encoded IR */
-#define IR_TYPE_NEC    (1  << 2)
-#define IR_TYPE_RC6    (1  << 3)       /* Philips RC6 protocol */
+#define IR_TYPE_NEC    (1  << 1)
+#define IR_TYPE_RC6    (1  << 2)       /* Philips RC6 protocol */
+#define IR_TYPE_JVC    (1  << 3)       /* JVC protocol */
+#define IR_TYPE_SONY   (1  << 4)       /* Sony12/15/20 protocol */
 #define IR_TYPE_OTHER  (1u << 31)
 
 struct ir_scancode {
@@ -54,7 +55,8 @@ void rc_map_init(void);
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
 #define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
-#define RC_MAP_AVERMEDIA_M135A_RM_JX     "rc-avermedia-m135a-rm-jx"
+#define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
+#define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
 #define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
@@ -79,6 +81,8 @@ void rc_map_init(void);
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
 #define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge-new"
+#define RC_MAP_IMON_MCE                  "rc-imon-mce"
+#define RC_MAP_IMON_PAD                  "rc-imon-pad"
 #define RC_MAP_IODATA_BCTV7E             "rc-iodata-bctv7e"
 #define RC_MAP_KAIOMY                    "rc-kaiomy"
 #define RC_MAP_KWORLD_315U               "rc-kworld-315u"