diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-24 12:18:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 19:24:14 -0300 |
| commit | 15195d3a83b59f0ca3bed52cbe5524042ce13fd6 (patch) | |
| tree | 0915c3f1d4e0dfacaf196c60e5e297e0388a3be7 /drivers/media/rc/mceusb.c | |
| parent | 0548757419c974d8c0851c13279b2c89a12b2978 (diff) | |
| download | kernel_goldelico_gta04-15195d3a83b59f0ca3bed52cbe5524042ce13fd6.zip kernel_goldelico_gta04-15195d3a83b59f0ca3bed52cbe5524042ce13fd6.tar.gz kernel_goldelico_gta04-15195d3a83b59f0ca3bed52cbe5524042ce13fd6.tar.bz2 | |
[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
There are two "hauppauge-new" keymaps, one with protocol
unknown, and the other with the protocol marked accordingly.
However, both tables are miss-named.
Also, the old rc-hauppauge-new is broken, as it mixes
three different controllers as if they were just one.
This patch solves half of the problem by renaming the
correct keycode table as just rc-hauppauge. This table
contains the codes for the four different types of
remote controllers found on Hauppauge cards, properly
mapped with their different addresses.
create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c
delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
[Jarod: fix up RC_MAP_HAUPPAUGE defines]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Diffstat (limited to 'drivers/media/rc/mceusb.c')
| -rw-r--r-- | drivers/media/rc/mceusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index e4f8eac..eedefce 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] = { |