aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/rc-core.h4
-rw-r--r--include/media/rc-map.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 42543257fa0f..affb93feed3b 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -39,7 +39,7 @@ enum rc_driver_type {
39 * @input_id: id of the input child device (struct input_id) 39 * @input_id: id of the input child device (struct input_id)
40 * @driver_name: name of the hardware driver which registered this device 40 * @driver_name: name of the hardware driver which registered this device
41 * @map_name: name of the default keymap 41 * @map_name: name of the default keymap
42 * @rc_tab: current scan/key table 42 * @rc_map: current scan/key table
43 * @devno: unique remote control device number 43 * @devno: unique remote control device number
44 * @raw: additional data for raw pulse/space devices 44 * @raw: additional data for raw pulse/space devices
45 * @input_dev: the input child device used to communicate events to userspace 45 * @input_dev: the input child device used to communicate events to userspace
@@ -86,7 +86,7 @@ struct rc_dev {
86 struct input_id input_id; 86 struct input_id input_id;
87 char *driver_name; 87 char *driver_name;
88 const char *map_name; 88 const char *map_name;
89 struct ir_scancode_table rc_tab; 89 struct rc_map rc_map;
90 unsigned long devno; 90 unsigned long devno;
91 struct ir_raw_event_ctrl *raw; 91 struct ir_raw_event_ctrl *raw;
92 struct input_dev *input_dev; 92 struct input_dev *input_dev;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index c53351e15f50..a6b2738f2d60 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -30,7 +30,7 @@ struct ir_scancode {
30 u32 keycode; 30 u32 keycode;
31}; 31};
32 32
33struct ir_scancode_table { 33struct rc_map {
34 struct ir_scancode *scan; 34 struct ir_scancode *scan;
35 unsigned int size; /* Max number of entries */ 35 unsigned int size; /* Max number of entries */
36 unsigned int len; /* Used number of entries */ 36 unsigned int len; /* Used number of entries */
@@ -42,14 +42,14 @@ struct ir_scancode_table {
42 42
43struct rc_keymap { 43struct rc_keymap {
44 struct list_head list; 44 struct list_head list;
45 struct ir_scancode_table map; 45 struct rc_map map;
46}; 46};
47 47
48/* Routines from rc-map.c */ 48/* Routines from rc-map.c */
49 49
50int ir_register_map(struct rc_keymap *map); 50int ir_register_map(struct rc_keymap *map);
51void ir_unregister_map(struct rc_keymap *map); 51void ir_unregister_map(struct rc_keymap *map);
52struct ir_scancode_table *get_rc_map(const char *name); 52struct rc_map *get_rc_map(const char *name);
53void rc_map_init(void); 53void rc_map_init(void);
54 54
55/* Names of the several keytables defined in-kernel */ 55/* Names of the several keytables defined in-kernel */