Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Jarod Wilson and committed by
Mauro Carvalho Chehab
d8ee99e7 d0ff2371

+7 -1
+7 -1
drivers/media/rc/mceusb.c
··· 149 149 POLARIS_EVK, 150 150 CX_HYBRID_TV, 151 151 MULTIFUNCTION, 152 + TIVO_KIT, 152 153 }; 153 154 154 155 struct mceusb_model { ··· 197 196 [MULTIFUNCTION] = { 198 197 .mce_gen2 = 1, 199 198 .ir_intfnum = 2, 199 + }, 200 + [TIVO_KIT] = { 201 + .mce_gen2 = 1, 202 + .rc_map = RC_MAP_TIVO, 200 203 }, 201 204 }; 202 205 ··· 313 308 /* Northstar Systems, Inc. eHome Infrared Transceiver */ 314 309 { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) }, 315 310 /* TiVo PC IR Receiver */ 316 - { USB_DEVICE(VENDOR_TIVO, 0x2000) }, 311 + { USB_DEVICE(VENDOR_TIVO, 0x2000), 312 + .driver_info = TIVO_KIT }, 317 313 /* Conexant Hybrid TV "Shelby" Polaris SDK */ 318 314 { USB_DEVICE(VENDOR_CONEXANT, 0x58a1), 319 315 .driver_info = POLARIS_EVK },