diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 20:34:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:36 -0500 |
commit | e890759220759dfe4f3bea91a2deafb565ec10e9 (patch) | |
tree | c5fd26feb94269c91ab0392bf88b577cc96cd0b5 /drivers/media/video | |
parent | ed14e1c2f419a380c7a1a3483ac2443d20a24355 (diff) |
V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
The DVC 100 profile is redundant since we already have an existing identical
profile named "Pinnacle Dazzle DVC 90/DVC 100"
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 14 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index c427c0eeba1d..41d86e6f69c4 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -339,20 +339,6 @@ struct em28xx_board em28xx_boards[] = { | |||
339 | .amux = EM28XX_AMUX_LINE_IN, | 339 | .amux = EM28XX_AMUX_LINE_IN, |
340 | } }, | 340 | } }, |
341 | }, | 341 | }, |
342 | [EM2820_BOARD_PINNACLE_DVC_100] = { | ||
343 | .name = "Pinnacle Dazzle DVC 100", | ||
344 | .decoder = EM28XX_SAA711X, | ||
345 | .tuner_type = TUNER_ABSENT, /* Capture only device */ | ||
346 | .input = { { | ||
347 | .type = EM28XX_VMUX_COMPOSITE1, | ||
348 | .vmux = SAA7115_COMPOSITE0, | ||
349 | .amux = EM28XX_AMUX_LINE_IN, | ||
350 | }, { | ||
351 | .type = EM28XX_VMUX_SVIDEO, | ||
352 | .vmux = SAA7115_SVIDEO3, | ||
353 | .amux = EM28XX_AMUX_LINE_IN, | ||
354 | } }, | ||
355 | }, | ||
356 | [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { | 342 | [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { |
357 | .name = "Videology 20K14XUSB USB2.0", | 343 | .name = "Videology 20K14XUSB USB2.0", |
358 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 344 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 317512da9824..650f4ec82185 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -67,7 +67,6 @@ | |||
67 | #define EM2820_BOARD_HERCULES_SMART_TV_USB2 26 | 67 | #define EM2820_BOARD_HERCULES_SMART_TV_USB2 26 |
68 | #define EM2820_BOARD_PINNACLE_USB_2_FM1216ME 27 | 68 | #define EM2820_BOARD_PINNACLE_USB_2_FM1216ME 27 |
69 | #define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28 | 69 | #define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28 |
70 | #define EM2820_BOARD_PINNACLE_DVC_100 29 | ||
71 | #define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30 | 70 | #define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30 |
72 | #define EM2821_BOARD_USBGEAR_VD204 31 | 71 | #define EM2821_BOARD_USBGEAR_VD204 31 |
73 | #define EM2821_BOARD_SUPERCOMP_USB_2 32 | 72 | #define EM2821_BOARD_SUPERCOMP_USB_2 32 |