aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx1
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c20
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
3 files changed, 0 insertions, 22 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 77874bd20550..dafbd955ee1b 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -30,7 +30,6 @@
30 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840) 30 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840)
31 31 -> Usbgear VD204v9 (em2821) 31 31 -> Usbgear VD204v9 (em2821)
32 32 -> Supercomp USB 2.0 TV (em2821) 32 32 -> Supercomp USB 2.0 TV (em2821)
33 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0 (em2821)
34 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f] 33 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f]
35 35 -> Typhoon DVD Maker (em2860) 34 35 -> Typhoon DVD Maker (em2860)
36 36 -> NetGMBH Cam (em2860) 35 36 -> NetGMBH Cam (em2860)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 2b27460dae35..e263ab0f4ee4 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -369,26 +369,6 @@ struct em28xx_board em28xx_boards[] = {
369 .amux = EM28XX_AMUX_VIDEO, 369 .amux = EM28XX_AMUX_VIDEO,
370 } }, 370 } },
371 }, 371 },
372 [EM2821_BOARD_PROLINK_PLAYTV_USB2] = {
373 .name = "SIIG AVTuner-PVR/Prolink PlayTV USB 2.0",
374 .valid = EM28XX_BOARD_NOT_VALIDATED,
375 .tuner_type = TUNER_LG_PAL_NEW_TAPC, /* unknown? */
376 .tda9887_conf = TDA9887_PRESENT, /* unknown? */
377 .decoder = EM28XX_SAA711X,
378 .input = { {
379 .type = EM28XX_VMUX_TELEVISION,
380 .vmux = SAA7115_COMPOSITE2,
381 .amux = EM28XX_AMUX_LINE_IN,
382 }, {
383 .type = EM28XX_VMUX_COMPOSITE1,
384 .vmux = SAA7115_COMPOSITE0,
385 .amux = EM28XX_AMUX_LINE_IN,
386 }, {
387 .type = EM28XX_VMUX_SVIDEO,
388 .vmux = SAA7115_SVIDEO3,
389 .amux = EM28XX_AMUX_LINE_IN,
390 } },
391 },
392 [EM2821_BOARD_SUPERCOMP_USB_2] = { 372 [EM2821_BOARD_SUPERCOMP_USB_2] = {
393 .name = "Supercomp USB 2.0 TV", 373 .name = "Supercomp USB 2.0 TV",
394 .valid = EM28XX_BOARD_NOT_VALIDATED, 374 .valid = EM28XX_BOARD_NOT_VALIDATED,
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 89a793cb8ca4..57a4084f9b5e 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -70,7 +70,6 @@
70#define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30 70#define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30
71#define EM2821_BOARD_USBGEAR_VD204 31 71#define EM2821_BOARD_USBGEAR_VD204 31
72#define EM2821_BOARD_SUPERCOMP_USB_2 32 72#define EM2821_BOARD_SUPERCOMP_USB_2 32
73#define EM2821_BOARD_PROLINK_PLAYTV_USB2 33
74#define EM2860_BOARD_TERRATEC_HYBRID_XS 34 73#define EM2860_BOARD_TERRATEC_HYBRID_XS 34
75#define EM2860_BOARD_TYPHOON_DVD_MAKER 35 74#define EM2860_BOARD_TYPHOON_DVD_MAKER 35
76#define EM2860_BOARD_NETGMBH_CAM 36 75#define EM2860_BOARD_NETGMBH_CAM 36