diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/media/ir-kbd-i2c.h | 2 | ||||
-rw-r--r-- | include/media/rc-map.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h index 057ff64f349d..0506e45c9a4f 100644 --- a/include/media/ir-kbd-i2c.h +++ b/include/media/ir-kbd-i2c.h | |||
@@ -36,7 +36,7 @@ enum ir_kbd_get_key_fn { | |||
36 | struct IR_i2c_init_data { | 36 | struct IR_i2c_init_data { |
37 | char *ir_codes; | 37 | char *ir_codes; |
38 | const char *name; | 38 | const char *name; |
39 | u64 type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */ | 39 | u64 type; /* IR_TYPE_RC5, etc */ |
40 | /* | 40 | /* |
41 | * Specify either a function pointer or a value indicating one of | 41 | * Specify either a function pointer or a value indicating one of |
42 | * ir_kbd_i2c's internal get_key functions | 42 | * ir_kbd_i2c's internal get_key functions |
diff --git a/include/media/rc-map.h b/include/media/rc-map.h index 280d1ed9a9a0..5833966a7100 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h | |||
@@ -13,11 +13,10 @@ | |||
13 | 13 | ||
14 | #define IR_TYPE_UNKNOWN 0 | 14 | #define IR_TYPE_UNKNOWN 0 |
15 | #define IR_TYPE_RC5 (1 << 0) /* Philips RC5 protocol */ | 15 | #define IR_TYPE_RC5 (1 << 0) /* Philips RC5 protocol */ |
16 | #define IR_TYPE_PD (1 << 1) /* Pulse distance encoded IR */ | 16 | #define IR_TYPE_NEC (1 << 1) |
17 | #define IR_TYPE_NEC (1 << 2) | 17 | #define IR_TYPE_RC6 (1 << 2) /* Philips RC6 protocol */ |
18 | #define IR_TYPE_RC6 (1 << 3) /* Philips RC6 protocol */ | 18 | #define IR_TYPE_JVC (1 << 3) /* JVC protocol */ |
19 | #define IR_TYPE_JVC (1 << 4) /* JVC protocol */ | 19 | #define IR_TYPE_SONY (1 << 4) /* Sony12/15/20 protocol */ |
20 | #define IR_TYPE_SONY (1 << 5) /* Sony12/15/20 protocol */ | ||
21 | #define IR_TYPE_OTHER (1u << 31) | 20 | #define IR_TYPE_OTHER (1u << 31) |
22 | 21 | ||
23 | struct ir_scancode { | 22 | struct ir_scancode { |