aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/siano/smsusb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-08-31 16:03:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:00 -0400
commit841a3f0de9a55682d33aa8bf770ff4f7cbb7e5da (patch)
tree4c5caac2f9cc9674b2d585d2b87cdfada6989d84 /drivers/media/dvb/siano/smsusb.c
parentdba843afad56245949700ff478210b2acbcb2428 (diff)
V4L/DVB (10749): sms1xxx: move smsusb_id_table into smsusb.c
Move the usb_device_id table to the smsusb module in preparation for the sms1xxx module to be split into sub-modules. This will allow the smsusb driver to start up automatically upon insertion of the USB device. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/siano/smsusb.c')
-rw-r--r--drivers/media/dvb/siano/smsusb.c47
1 files changed, 47 insertions, 0 deletions
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 0f3506ec1acc..f8cfeaae5cc1 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -474,6 +474,53 @@ static int smsusb_resume(struct usb_interface *intf)
474 return 0; 474 return 0;
475} 475}
476 476
477struct usb_device_id smsusb_id_table[] = {
478#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
479 { USB_DEVICE(0x187f, 0x0010),
480 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
481 { USB_DEVICE(0x187f, 0x0100),
482 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
483 { USB_DEVICE(0x187f, 0x0200),
484 .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
485 { USB_DEVICE(0x187f, 0x0201),
486 .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
487 { USB_DEVICE(0x187f, 0x0300),
488 .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
489#endif
490 { USB_DEVICE(0x2040, 0x1700),
491 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
492 { USB_DEVICE(0x2040, 0x1800),
493 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
494 { USB_DEVICE(0x2040, 0x1801),
495 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
496 { USB_DEVICE(0x2040, 0x2000),
497 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
498 { USB_DEVICE(0x2040, 0x2009),
499 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
500 { USB_DEVICE(0x2040, 0x200a),
501 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
502 { USB_DEVICE(0x2040, 0x2010),
503 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
504 { USB_DEVICE(0x2040, 0x2011),
505 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
506 { USB_DEVICE(0x2040, 0x2019),
507 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
508 { USB_DEVICE(0x2040, 0x5500),
509 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
510 { USB_DEVICE(0x2040, 0x5510),
511 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
512 { USB_DEVICE(0x2040, 0x5520),
513 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
514 { USB_DEVICE(0x2040, 0x5530),
515 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
516 { USB_DEVICE(0x2040, 0x5580),
517 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
518 { USB_DEVICE(0x2040, 0x5590),
519 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
520 { } /* Terminating entry */
521};
522MODULE_DEVICE_TABLE(usb, smsusb_id_table);
523
477static struct usb_driver smsusb_driver = { 524static struct usb_driver smsusb_driver = {
478 .name = "smsusb", 525 .name = "smsusb",
479 .probe = smsusb_probe, 526 .probe = smsusb_probe,