diff options
| author | Jarod Wilson <jarod@redhat.com> | 2011-03-24 12:59:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 09:27:31 -0300 |
| commit | d8ee99e79994f916bc5b81990f861ea923e7f332 (patch) | |
| tree | c2222627aacb9b2488de9c3b953d56dae83280fc /drivers | |
| parent | d0ff237133bf05c16d5604906cfb8774c5751b81 (diff) | |
| download | linux-3.10-d8ee99e79994f916bc5b81990f861ea923e7f332.tar.gz linux-3.10-d8ee99e79994f916bc5b81990f861ea923e7f332.tar.bz2 linux-3.10-d8ee99e79994f916bc5b81990f861ea923e7f332.zip | |
[media] mceusb: tivo transceiver should default to tivo keymap
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/rc/mceusb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index 0c273ec465c..9145be9c0f0 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -149,6 +149,7 @@ enum mceusb_model_type { POLARIS_EVK, CX_HYBRID_TV, MULTIFUNCTION, + TIVO_KIT, }; struct mceusb_model { @@ -197,6 +198,10 @@ static const struct mceusb_model mceusb_model[] = { .mce_gen2 = 1, .ir_intfnum = 2, }, + [TIVO_KIT] = { + .mce_gen2 = 1, + .rc_map = RC_MAP_TIVO, + }, }; static struct usb_device_id mceusb_dev_table[] = { @@ -308,7 +313,8 @@ static struct usb_device_id mceusb_dev_table[] = { /* Northstar Systems, Inc. eHome Infrared Transceiver */ { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) }, /* TiVo PC IR Receiver */ - { USB_DEVICE(VENDOR_TIVO, 0x2000) }, + { USB_DEVICE(VENDOR_TIVO, 0x2000), + .driver_info = TIVO_KIT }, /* Conexant Hybrid TV "Shelby" Polaris SDK */ { USB_DEVICE(VENDOR_CONEXANT, 0x58a1), .driver_info = POLARIS_EVK }, |