6 files changed, 15 insertions, 9 deletions

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 25b43e587fa..af121db88ea 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = {
                 .type   = SMS_NOVA_B0,
                 .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
                 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
-                .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
+                .rc_codes = RC_MAP_HAUPPAUGE,
                 .board_cfg.leds_power = 26,
                 .board_cfg.led0 = 27,
                 .board_cfg.led1 = 28,
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index cb721216571..1f446f99b61 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                         rc-proteus-2309.o \
                         rc-purpletv.o \
                         rc-pv951.o \
-                        rc-rc5-hauppauge-new.o \
+                        rc-hauppauge.o \
                         rc-rc5-tv.o \
                         rc-rc6-mce.o \
                         rc-real-audio-220-32-keys.o \
diff --git a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge.c
index cb312dae6fa..cd3db777977 100644
--- a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
+++ b/drivers/media/rc/keymaps/rc-hauppauge.c
@@ -1,8 +1,14 @@
-/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller
+/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers
  *
  * keymap imported from ir-keymaps.c
  *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * This map currently contains the code for four different RCs:
+ *      - New Hauppauge Gray;
+ *      - Old Hauppauge Gray (with a golden screen for media keys);
+ *      - Hauppauge Black;
+ *      - DSR-0112 remote bundled with Haupauge MiniStick.
+ *
+ * Copyright (c) 2010-2011 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -214,7 +220,7 @@ static struct rc_map_list rc5_hauppauge_new_map = {
                 .scan    = rc5_hauppauge_new,
                 .size    = ARRAY_SIZE(rc5_hauppauge_new),
                 .rc_type = RC_TYPE_RC5,
-                .name    = RC_MAP_RC5_HAUPPAUGE_NEW,
+                .name    = RC_MAP_HAUPPAUGE,
         }
 };
 
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index e4f8eac7f71..eedefce86fc 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -186,7 +186,7 @@ static const struct mceusb_model mceusb_model[] = {
                  * remotes, but we should have something handy,
                  * to allow testing it
                  */
-                .rc_map = RC_MAP_RC5_HAUPPAUGE_NEW,
+                .rc_map = RC_MAP_HAUPPAUGE,
                 .name = "Conexant Hybrid TV (cx231xx) MCE IR",
         },
         [CX_HYBRID_TV] = {
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 199b9964bbe..e97cafd8398 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -264,7 +264,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
                 driver_type = RC_DRIVER_IR_RAW;
                 allowed_protos = RC_TYPE_ALL;
                 /* The grey Hauppauge RC-5 remote */
-                rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
+                rc_map = RC_MAP_HAUPPAUGE;
                 break;
         case CX23885_BOARD_TEVII_S470:
                 /* Integrated CX23885 IR controller */
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 87f77a34eea..aa4f45e692e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -911,7 +911,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
+                .ir_codes       = RC_MAP_HAUPPAUGE,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -2430,7 +2430,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-                dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
+                dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
                 break;