aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMark Lord <mlord@pobox.com>2012-07-11 17:53:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 20:36:03 -0400
commita4de5f058c56a3cc72dc31dabc548eab100e3d2d (patch)
treea44599f52474752dddff0c2c64647c2bb93cb783 /drivers/media
parentb1f093ac6807a264100b24b1a4939cff6e35c144 (diff)
[media] mceusb: Add Twisted Melon USB IDs
Add USB identifiers for MCE compatible I/R transceivers from Twisted Melon. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/mceusb.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 84e06d3aa696..b7d3588fe87a 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -199,6 +199,7 @@ static bool debug;
199#define VENDOR_REALTEK 0x0bda 199#define VENDOR_REALTEK 0x0bda
200#define VENDOR_TIVO 0x105a 200#define VENDOR_TIVO 0x105a
201#define VENDOR_CONEXANT 0x0572 201#define VENDOR_CONEXANT 0x0572
202#define VENDOR_TWISTEDMELON 0x2596
202 203
203enum mceusb_model_type { 204enum mceusb_model_type {
204 MCE_GEN2 = 0, /* Most boards */ 205 MCE_GEN2 = 0, /* Most boards */
@@ -391,6 +392,12 @@ static struct usb_device_id mceusb_dev_table[] = {
391 /* Conexant Hybrid TV RDU253S Polaris */ 392 /* Conexant Hybrid TV RDU253S Polaris */
392 { USB_DEVICE(VENDOR_CONEXANT, 0x58a5), 393 { USB_DEVICE(VENDOR_CONEXANT, 0x58a5),
393 .driver_info = CX_HYBRID_TV }, 394 .driver_info = CX_HYBRID_TV },
395 /* Twisted Melon Inc. - Manta Mini Receiver */
396 { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8008) },
397 /* Twisted Melon Inc. - Manta Pico Receiver */
398 { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8016) },
399 /* Twisted Melon Inc. - Manta Transceiver */
400 { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8042) },
394 /* Terminating entry */ 401 /* Terminating entry */
395 { } 402 { }
396}; 403};