The patch number 10739 was added via Douglas Schilling Landgraf 
<dougsl...@redhat.com>
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:
        Linux Media Mailing List <linux-me...@vger.kernel.org>

------

From: Douglas Schilling Landgraf  <dougsl...@redhat.com>
em28xx-cards: remove incorrect entry


Removed EM2821_BOARD_PROLINK_PLAYTV_USB2 entry.
This entry has a incorrect tuner set.

Priority: normal

Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com>


---

 linux/Documentation/video4linux/CARDLIST.em28xx |    1 
 linux/drivers/media/video/em28xx/em28xx-cards.c |   20 ----------------
 linux/drivers/media/video/em28xx/em28xx.h       |    1 
 3 files changed, 22 deletions(-)

diff -r f88e18becfe7 -r 1694391996bb 
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx   Thu Feb 26 16:35:44 
2009 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx   Wed Feb 25 16:52:31 
2009 -0300
@@ -30,7 +30,6 @@
  30 -> Videology 20K14XUSB USB2.0               (em2820/em2840)
  31 -> Usbgear VD204v9                          (em2821)
  32 -> Supercomp USB 2.0 TV                     (em2821)
- 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0  (em2821)
  34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]
  35 -> Typhoon DVD Maker                        (em2860)
  36 -> NetGMBH Cam                              (em2860)
diff -r f88e18becfe7 -r 1694391996bb 
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c   Thu Feb 26 16:35:44 
2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c   Wed Feb 25 16:52:31 
2009 -0300
@@ -380,26 +380,6 @@ struct em28xx_board em28xx_boards[] = {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = 0,
                        .amux     = EM28XX_AMUX_VIDEO,
-               } },
-       },
-       [EM2821_BOARD_PROLINK_PLAYTV_USB2] = {
-               .name         = "SIIG AVTuner-PVR/Prolink PlayTV USB 2.0",
-               .valid        = EM28XX_BOARD_NOT_VALIDATED,
-               .tuner_type   = TUNER_LG_PAL_NEW_TAPC,  /* unknown? */
-               .tda9887_conf = TDA9887_PRESENT,        /* unknown? */
-               .decoder      = EM28XX_SAA711X,
-               .input        = { {
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
-                       .amux     = EM28XX_AMUX_LINE_IN,
-               }, {
-                       .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
-                       .amux     = EM28XX_AMUX_LINE_IN,
-               }, {
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
-                       .amux     = EM28XX_AMUX_LINE_IN,
                } },
        },
        [EM2821_BOARD_SUPERCOMP_USB_2] = {
diff -r f88e18becfe7 -r 1694391996bb linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Thu Feb 26 16:35:44 2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 25 16:52:31 2009 -0300
@@ -71,7 +71,6 @@
 #define EM2820_BOARD_VIDEOLOGY_20K14XUSB         30
 #define EM2821_BOARD_USBGEAR_VD204               31
 #define EM2821_BOARD_SUPERCOMP_USB_2             32
-#define EM2821_BOARD_PROLINK_PLAYTV_USB2         33
 #define EM2860_BOARD_TERRATEC_HYBRID_XS                  34
 #define EM2860_BOARD_TYPHOON_DVD_MAKER           35
 #define EM2860_BOARD_NETGMBH_CAM                 36


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/1694391996bbb6a32117f93d485249d51e87983e

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to