aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-08-01 12:48:20 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:43:53 -0400
commit4eebfb0a5f55ba7c4af33c2173862493d8845622 (patch)
tree095277f75316b6698e7e5b3ec42e0137440d102e /drivers
parent20d64443ecaaedb971193a305c32b672c81fc819 (diff)
V4L/DVB: standardize names at rc-dib0700 tables
Use a more standard way to name those tables, as they're currently used by the script that coverts those tables to be loaded via userspace. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/IR/keymaps/rc-dib0700-nec.c12
-rw-r--r--drivers/media/IR/keymaps/rc-dib0700-rc5.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c
index f5809f4757f9..ae1832038fbe 100644
--- a/drivers/media/IR/keymaps/rc-dib0700-nec.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c
@@ -17,7 +17,7 @@
17 17
18#include <media/rc-map.h> 18#include <media/rc-map.h>
19 19
20static struct ir_scancode dib0700_table[] = { 20static struct ir_scancode dib0700_nec_table[] = {
21 /* Key codes for the Pixelview SBTVD remote */ 21 /* Key codes for the Pixelview SBTVD remote */
22 { 0x8613, KEY_MUTE }, 22 { 0x8613, KEY_MUTE },
23 { 0x8612, KEY_POWER }, 23 { 0x8612, KEY_POWER },
@@ -98,10 +98,10 @@ static struct ir_scancode dib0700_table[] = {
98 { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */ 98 { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
99}; 99};
100 100
101static struct rc_keymap dib0700_map = { 101static struct rc_keymap dib0700_nec_map = {
102 .map = { 102 .map = {
103 .scan = dib0700_table, 103 .scan = dib0700_nec_table,
104 .size = ARRAY_SIZE(dib0700_table), 104 .size = ARRAY_SIZE(dib0700_nec_table),
105 .ir_type = IR_TYPE_NEC, 105 .ir_type = IR_TYPE_NEC,
106 .name = RC_MAP_DIB0700_NEC_TABLE, 106 .name = RC_MAP_DIB0700_NEC_TABLE,
107 } 107 }
@@ -109,12 +109,12 @@ static struct rc_keymap dib0700_map = {
109 109
110static int __init init_rc_map(void) 110static int __init init_rc_map(void)
111{ 111{
112 return ir_register_map(&dib0700_map); 112 return ir_register_map(&dib0700_nec_map);
113} 113}
114 114
115static void __exit exit_rc_map(void) 115static void __exit exit_rc_map(void)
116{ 116{
117 ir_unregister_map(&dib0700_map); 117 ir_unregister_map(&dib0700_nec_map);
118} 118}
119 119
120module_init(init_rc_map) 120module_init(init_rc_map)
diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
index e2d0fd2bbaf9..4a4797cfd77d 100644
--- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
@@ -17,7 +17,7 @@
17 17
18#include <media/rc-map.h> 18#include <media/rc-map.h>
19 19
20static struct ir_scancode dib0700_table[] = { 20static struct ir_scancode dib0700_rc5_table[] = {
21 /* Key codes for the tiny Pinnacle remote*/ 21 /* Key codes for the tiny Pinnacle remote*/
22 { 0x0700, KEY_MUTE }, 22 { 0x0700, KEY_MUTE },
23 { 0x0701, KEY_MENU }, /* Pinnacle logo */ 23 { 0x0701, KEY_MENU }, /* Pinnacle logo */
@@ -209,10 +209,10 @@ static struct ir_scancode dib0700_table[] = {
209 { 0x1d3d, KEY_POWER }, 209 { 0x1d3d, KEY_POWER },
210}; 210};
211 211
212static struct rc_keymap dib0700_map = { 212static struct rc_keymap dib0700_rc5_map = {
213 .map = { 213 .map = {
214 .scan = dib0700_table, 214 .scan = dib0700_rc5_table,
215 .size = ARRAY_SIZE(dib0700_table), 215 .size = ARRAY_SIZE(dib0700_rc5_table),
216 .ir_type = IR_TYPE_RC5, 216 .ir_type = IR_TYPE_RC5,
217 .name = RC_MAP_DIB0700_RC5_TABLE, 217 .name = RC_MAP_DIB0700_RC5_TABLE,
218 } 218 }
@@ -220,12 +220,12 @@ static struct rc_keymap dib0700_map = {
220 220
221static int __init init_rc_map(void) 221static int __init init_rc_map(void)
222{ 222{
223 return ir_register_map(&dib0700_map); 223 return ir_register_map(&dib0700_rc5_map);
224} 224}
225 225
226static void __exit exit_rc_map(void) 226static void __exit exit_rc_map(void)
227{ 227{
228 ir_unregister_map(&dib0700_map); 228 ir_unregister_map(&dib0700_rc5_map);
229} 229}
230 230
231module_init(init_rc_map) 231module_init(init_rc_map)