2 files changed, 10 insertions, 4 deletions

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,
         }
 };