diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 20:34:35 -0500 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 20:34:35 -0500 |
| commit | 82fa6fab36f911ab758e0ae4efaf3ba0b5d258ac (patch) | |
| tree | fad794044824ae1cf638b2a56e8a0441f434ac60 /linux | |
| parent | ff2201e0c9fe05a42a4ef6473a8b744a08f1f9cc (diff) | |
| download | mediapointer-dvb-s2-82fa6fab36f911ab758e0ae4efaf3ba0b5d258ac.tar.gz mediapointer-dvb-s2-82fa6fab36f911ab758e0ae4efaf3ba0b5d258ac.tar.bz2 | |
em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
From: Devin Heitmueller <dheitmueller@linuxtv.org>
The DVC 100 profile is redundant since we already have an existing identical
profile named "Pinnacle Dazzle DVC 90/DVC 100"
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.em28xx | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx index 96b1eb8ac..79fd7f97a 100644 --- a/linux/Documentation/video4linux/CARDLIST.em28xx +++ b/linux/Documentation/video4linux/CARDLIST.em28xx @@ -27,7 +27,6 @@ 26 -> Hercules Smart TV USB 2.0 (em2820/em2840) 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME) (em2820/em2840) 28 -> Leadtek Winfast USB II Deluxe (em2820/em2840) - 29 -> Pinnacle Dazzle DVC 100 (em2820/em2840) 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840) 31 -> Usbgear VD204v9 (em2821) 32 -> Supercomp USB 2.0 TV (em2821) diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 40a85a88e..09a42b24a 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -352,20 +352,6 @@ struct em28xx_board em28xx_boards[] = { .amux = EM28XX_AMUX_LINE_IN, } }, }, - [EM2820_BOARD_PINNACLE_DVC_100] = { - .name = "Pinnacle Dazzle DVC 100", - .decoder = EM28XX_SAA711X, - .tuner_type = TUNER_ABSENT, /* Capture only device */ - .input = { { - .type = EM28XX_VMUX_COMPOSITE1, - .vmux = SAA7115_COMPOSITE0, - .amux = EM28XX_AMUX_LINE_IN, - }, { - .type = EM28XX_VMUX_SVIDEO, - .vmux = SAA7115_SVIDEO3, - .amux = EM28XX_AMUX_LINE_IN, - } }, - }, [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { .name = "Videology 20K14XUSB USB2.0", .valid = EM28XX_BOARD_NOT_VALIDATED, diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index 93c47f260..79bf87952 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -68,7 +68,6 @@ #define EM2820_BOARD_HERCULES_SMART_TV_USB2 26 #define EM2820_BOARD_PINNACLE_USB_2_FM1216ME 27 #define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28 -#define EM2820_BOARD_PINNACLE_DVC_100 29 #define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30 #define EM2821_BOARD_USBGEAR_VD204 31 #define EM2821_BOARD_SUPERCOMP_USB_2 32 |