aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 11:10:16 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 11:10:16 (GMT)
commit3c91560bf96a1f7ad39131e7730fd319647ff734 (patch)
treec48b8d3f06af2f6ed04efc916b1624892ccc543b /drivers/media/video/em28xx/em28xx-cards.c
parentaf4c52a75b2ffd0ad7514acc681759d2e44a5d46 (diff)
parentdedb94adebe0fbdd9cafdbb170337810d8638bc9 (diff)
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: [media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes [media] timblogiw: const and __devinitdata do not mix [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor [media] gspca core: Fix regressions gspca breaking devices with audio [media] gspca/sn9c20x: Get rid of scale "magic" numbers [media] gspca/sn9c20x: Test if sensor is a OV sensor [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick [media] media: Remove unnecessary casts of usb_get_intfdata [media] Terratec Cinergy Hybrid T USB XS [media] media: rc: lirc_dev: check kobject_set_name() result [media] rc-core: add loopback driver
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ed25c55..5d79d0e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1496,7 +1496,7 @@ struct em28xx_board em28xx_boards[] = {
} },
},
[EM2882_BOARD_TERRATEC_HYBRID_XS] = {
- .name = "Terratec Hybrid XS (em2882)",
+ .name = "Terratec Cinnergy Hybrid T USB XS (em2882)",
.tuner_type = TUNER_XC2028,
.tuner_gpio = default_tuner_gpio,
.mts_firmware = 1,
@@ -1820,7 +1820,7 @@ struct usb_device_id em28xx_id_table[] = {
{ USB_DEVICE(0x0ccd, 0x005e),
.driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
{ USB_DEVICE(0x0ccd, 0x0042),
- .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
+ .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
{ USB_DEVICE(0x0ccd, 0x0043),
.driver_info = EM2870_BOARD_TERRATEC_XS },
{ USB_DEVICE(0x0ccd, 0x0047),

Privacy Policy