Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 5814ec0455593b7c9418845cbbcec9a5719f2834..c78e99a435b6c019438059e84d72a67e55fc2bd8 100644 (file)
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -13,10 +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_JVC    (1  << 4)       /* JVC 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 {
@@ -55,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"