aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/mceusb.c
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-03-24 11:59:10 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 08:27:31 -0400
commitd8ee99e79994f916bc5b81990f861ea923e7f332 (patch)
treec2222627aacb9b2488de9c3b953d56dae83280fc /drivers/media/rc/mceusb.c
parentd0ff237133bf05c16d5604906cfb8774c5751b81 (diff)
[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/media/rc/mceusb.c')
-rw-r--r--drivers/media/rc/mceusb.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 0c273ec465c9..9145be9c0f04 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -149,6 +149,7 @@ enum mceusb_model_type {
149 POLARIS_EVK, 149 POLARIS_EVK,
150 CX_HYBRID_TV, 150 CX_HYBRID_TV,
151 MULTIFUNCTION, 151 MULTIFUNCTION,
152 TIVO_KIT,
152}; 153};
153 154
154struct mceusb_model { 155struct mceusb_model {
@@ -197,6 +198,10 @@ static const struct mceusb_model mceusb_model[] = {
197 .mce_gen2 = 1, 198 .mce_gen2 = 1,
198 .ir_intfnum = 2, 199 .ir_intfnum = 2,
199 }, 200 },
201 [TIVO_KIT] = {
202 .mce_gen2 = 1,
203 .rc_map = RC_MAP_TIVO,
204 },
200}; 205};
201 206
202static struct usb_device_id mceusb_dev_table[] = { 207static struct usb_device_id mceusb_dev_table[] = {
@@ -308,7 +313,8 @@ static struct usb_device_id mceusb_dev_table[] = {
308 /* Northstar Systems, Inc. eHome Infrared Transceiver */ 313 /* Northstar Systems, Inc. eHome Infrared Transceiver */
309 { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) }, 314 { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },
310 /* TiVo PC IR Receiver */ 315 /* TiVo PC IR Receiver */
311 { USB_DEVICE(VENDOR_TIVO, 0x2000) }, 316 { USB_DEVICE(VENDOR_TIVO, 0x2000),
317 .driver_info = TIVO_KIT },
312 /* Conexant Hybrid TV "Shelby" Polaris SDK */ 318 /* Conexant Hybrid TV "Shelby" Polaris SDK */
313 { USB_DEVICE(VENDOR_CONEXANT, 0x58a1), 319 { USB_DEVICE(VENDOR_CONEXANT, 0x58a1),
314 .driver_info = POLARIS_EVK }, 320 .driver_info = POLARIS_EVK },