[PATCH] v4l: cx88-dvb incorrect reporting fixed and remove bad PCI ID for Sabrent

- cx88-dvb has been incorrectly reporting the card name instead of frontend name
- Removes a bad PCI subsystem ID for saa713x Sabrent card
- Renames DVICO --> DViCO for bttv.
- #include <linux/config.h> no longer needed.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 2 insertions, 14 deletions

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 3cb398b7a028..64785d3fe838 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2258,7 +2258,7 @@ struct tvcard bttv_tvcards[] = {
 
         /* ---- card 0x80 ---------------------------------- */
         /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
-        .name           = "DVICO FusionHDTV DVB-T Lite",
+        .name           = "DViCO FusionHDTV DVB-T Lite",
         .tuner          = -1,
         .no_msp34xx     = 1,
         .no_tda9875     = 1,
@@ -2389,7 +2389,7 @@ struct tvcard bttv_tvcards[] = {
 {
         /* ---- card 0x87---------------------------------- */
         /* Michael Krufky <mkrufky@m1k.net> */
-        .name           = "DVICO FusionHDTV 5 Lite",
+        .name           = "DViCO FusionHDTV 5 Lite",
         .tuner          = 0,
         .tuner_type     = TUNER_LG_TDVS_H062F,
         .tuner_addr     = ADDR_UNSET,
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index cc71cafc2cbd..c9106b1d79df 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -28,7 +28,6 @@
 #include <linux/kthread.h>
 #include <linux/file.h>
 #include <linux/suspend.h>
-#include <linux/config.h>
 
 
 #include "cx88.h"
@@ -403,11 +402,6 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend->ops->info.frequency_max = dev->core->pll_desc->max;
         }
 
-        /* Copy the board name into the DVB structure */
-        strlcpy(dev->dvb.frontend->ops->info.name,
-                cx88_boards[dev->core->board].name,
-                sizeof(dev->dvb.frontend->ops->info.name));
-
         /* register everything */
         return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
 }
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index f991f2325340..07d3ee0ada7d 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2380,12 +2380,6 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_VIDEOMATE_TV_PVR,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
-                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
-                .subvendor    = 0x1131,
-                .subdevice    = 0,
-                .driver_data  = SAA7134_BOARD_SABRENT_SBTTVFM,
-        },{
-                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                 .subvendor    = 0x1461, /* Avermedia Technologies Inc */
                 .subdevice    = 0x9715,