The patch number 10120 was added via Devin Heitmueller
<dheitmuel...@linuxtv.org>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
v4l-dvb-maintai...@linuxtv.org
------
From: Devin Heitmueller <dheitmuel...@linuxtv.org>
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"
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmuel...@linuxtv.org>
---
linux/Documentation/video4linux/CARDLIST.em28xx | 1 -
linux/drivers/media/video/em28xx/em28xx-cards.c | 14 --------------
linux/drivers/media/video/em28xx/em28xx.h | 1 -
3 files changed, 16 deletions(-)
diff -r e134e56200b7 -r 41040ddfad77
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Mon Dec 29 20:27:30
2008 -0500
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Mon Dec 29 20:34:35
2008 -0500
@@ -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 -r e134e56200b7 -r 41040ddfad77
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Mon Dec 29 20:27:30
2008 -0500
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Mon Dec 29 20:34:35
2008 -0500
@@ -349,20 +349,6 @@ struct em28xx_board em28xx_boards[] = {
}, {
.type = EM28XX_VMUX_SVIDEO,
.vmux = SAA7115_COMPOSITE0,
- .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,
} },
},
diff -r e134e56200b7 -r 41040ddfad77 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Mon Dec 29 20:27:30 2008 -0500
+++ b/linux/drivers/media/video/em28xx/em28xx.h Mon Dec 29 20:34:35 2008 -0500
@@ -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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/41040ddfad77d861ab77c7d94b95f3a505969d1b
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
