aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/IR/keymaps/Makefile2
-rw-r--r--drivers/media/IR/keymaps/rc-msi-digivox-iii.c (renamed from drivers/media/IR/keymaps/rc-msi-digivox.c)22
-rw-r--r--include/media/rc-map.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index c3a8ab875a74..8053b20474fe 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -46,8 +46,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-lirc.o \
rc-lme2510.o \
rc-manli.o \
- rc-msi-digivox.o \
rc-msi-digivox-ii.o \
+ rc-msi-digivox-iii.o \
rc-msi-tvanywhere.o \
rc-msi-tvanywhere-plus.o \
rc-nebula.o \
diff --git a/drivers/media/IR/keymaps/rc-msi-digivox.c b/drivers/media/IR/keymaps/rc-msi-digivox-iii.c
index 3ba314052689..8ea3960347c3 100644
--- a/drivers/media/IR/keymaps/rc-msi-digivox.c
+++ b/drivers/media/IR/keymaps/rc-msi-digivox-iii.c
@@ -24,7 +24,7 @@
/* Uses NEC extended 0x61d6. */
/* This remote seems to be same as rc-kworld-315u.c. Anyhow, add new remote
since rc-kworld-315u.c lacks NEC extended address byte. */
-static struct ir_scancode msi_digivox[] = {
+static struct ir_scancode msi_digivox_iii[] = {
{ 0x61d601, KEY_VIDEO }, /* Source */
{ 0x61d602, KEY_3 },
{ 0x61d603, KEY_POWER2 }, /* ShutDown */
@@ -59,27 +59,27 @@ static struct ir_scancode msi_digivox[] = {
{ 0x61d643, KEY_POWER }, /* [red power button] */
};
-static struct rc_keymap msi_digivox_map = {
+static struct rc_keymap msi_digivox_iii_map = {
.map = {
- .scan = msi_digivox,
- .size = ARRAY_SIZE(msi_digivox),
+ .scan = msi_digivox_iii,
+ .size = ARRAY_SIZE(msi_digivox_iii),
.ir_type = IR_TYPE_NEC,
- .name = RC_MAP_MSI_DIGIVOX,
+ .name = RC_MAP_MSI_DIGIVOX_III,
}
};
-static int __init init_rc_map_msi_digivox(void)
+static int __init init_rc_map_msi_digivox_iii(void)
{
- return ir_register_map(&msi_digivox_map);
+ return ir_register_map(&msi_digivox_iii_map);
}
-static void __exit exit_rc_map_msi_digivox(void)
+static void __exit exit_rc_map_msi_digivox_iii(void)
{
- ir_unregister_map(&msi_digivox_map);
+ ir_unregister_map(&msi_digivox_iii_map);
}
-module_init(init_rc_map_msi_digivox)
-module_exit(exit_rc_map_msi_digivox)
+module_init(init_rc_map_msi_digivox_iii)
+module_exit(exit_rc_map_msi_digivox_iii)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index b31992323c24..f9fe29afe3df 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -103,8 +103,8 @@ void rc_map_init(void);
#define RC_MAP_LIRC "rc-lirc"
#define RC_MAP_LME2510 "rc-lme2510"
#define RC_MAP_MANLI "rc-manli"
-#define RC_MAP_MSI_DIGIVOX "rc-msi-digivox"
#define RC_MAP_MSI_DIGIVOX_II "rc-msi-digivox-ii"
+#define RC_MAP_MSI_DIGIVOX_III "rc-msi-digivox-iii"
#define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus"
#define RC_MAP_MSI_TVANYWHERE "rc-msi-tvanywhere"
#define RC_MAP_NEBULA "rc-nebula"

Privacy Policy