summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-09-30 12:21:15 +0000
committerGerd Knorr <devnull@localhost>2004-09-30 12:21:15 +0000
commita550d1ffb13c412ef15534bf63949634708c0f01 (patch)
tree3b6c51fe38d668a69718e547f68a0922246f3c55 /linux/drivers
parentd8b8880215760f30390a9797537f75dbefd4a556 (diff)
downloadmediapointer-dvb-s2-a550d1ffb13c412ef15534bf63949634708c0f01.tar.gz
mediapointer-dvb-s2-a550d1ffb13c412ef15534bf63949634708c0f01.tar.bz2
- cx88: build dvb stuff only on 2.6.9.
- saa7134: new card by Michael Rodriguez-Torrent. - bttv: remove check for cx88 boards.
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/bttv-driver.c11
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c27
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h3
3 files changed, 30 insertions, 11 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index df30742ed..9e907b251 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.16 2004/09/23 13:58:19 kraxel Exp $
+ $Id: bttv-driver.c,v 1.17 2004/09/30 12:21:15 kraxel Exp $
bttv - Bt848 frame grabber driver
@@ -4028,7 +4028,6 @@ static struct pci_driver bttv_pci_driver = {
static int bttv_init_module(void)
{
- int rc;
bttv_num = 0;
printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
@@ -4053,13 +4052,7 @@ static int bttv_init_module(void)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
bus_register(&bttv_sub_bus_type);
#endif
- rc = pci_module_init(&bttv_pci_driver);
- if (-ENODEV == rc) {
- /* plenty of people trying to use bttv for the cx2388x ... */
- if (NULL != pci_find_device(0x14f1, 0x8800, NULL))
- printk("bttv doesn't support your Conexant 2388x card.\n");
- }
- return rc;
+ return pci_module_init(&bttv_pci_driver);
}
static void bttv_cleanup_module(void)
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 836028b2d..99edb3073 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.25 2004/09/20 13:53:37 kraxel Exp $
+ * $Id: saa7134-cards.c,v 1.26 2004/09/30 12:21:15 kraxel Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -1117,6 +1117,31 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x40000,
},
},
+ [SAA7134_BOARD_SABRENT_SBTTVFM] = {
+ /* Michael Rodriguez-Torrent */
+ .name = "Sabrent SBT-TVFM (saa7130)",
+ .audio_clock = 0x00187de7,
+ .tuner_type = TUNER_PHILIPS_NTSC_M,
+ .tda9887_conf = TDA9887_PRESENT,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 3,
+ .amux = LINE2,
+ .tv = 1,
+ },{
+ .name = name_comp1,
+ .vmux = 1,
+ .amux = LINE2,
+ },{
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE2,
+ }},
+ .radio = {
+ .name = name_radio,
+ .amux = LINE2,
+ },
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 173e5aa07..d6bf37a1a 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134.h,v 1.19 2004/09/20 17:31:21 kraxel Exp $
+ * $Id: saa7134.h,v 1.20 2004/09/30 12:21:15 kraxel Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -181,6 +181,7 @@ struct saa7134_format {
#define SAA7134_BOARD_FLYTVPLATINUM 39
#define SAA7134_BOARD_VIDEOMATE_TV_PVR 40
#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS 41
+#define SAA7134_BOARD_SABRENT_SBTTVFM 42
#define SAA7134_INPUT_MAX 8