From 076664f48580f03e72e393549db859f70f162ae4 Mon Sep 17 00:00:00 2001 From: Philippe Bourdin Date: Sun, 31 Oct 2010 09:57:58 -0300 Subject: [PATCH] --- yaml --- r: 226299 b: refs/heads/master c: 9124544320bd36d5aa21769d17a5781ba729aebf h: refs/heads/master i: 226297: 917787c784733b2c9f6305e9d870fb23ab4c0a94 226295: 921751b43fd1db63ef12c9053246e88f2b31329d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8353862cc028..185031f241b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b395cbac36e58a55729fe7e6262a3f0b1691bced +refs/heads/master: 9124544320bd36d5aa21769d17a5781ba729aebf diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index ed25c5579c33..5d79d0eb64ab 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/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),