aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 834a48394bce..14444de67d5e 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -57,6 +57,7 @@
57 57
58#include <media/saa6588.h> 58#include <media/saa6588.h>
59 59
60#define BTTV_VERSION "0.9.19"
60 61
61unsigned int bttv_num; /* number of Bt848s in use */ 62unsigned int bttv_num; /* number of Bt848s in use */
62struct bttv *bttvs[BTTV_MAX]; 63struct bttv *bttvs[BTTV_MAX];
@@ -163,6 +164,7 @@ MODULE_PARM_DESC(radio_nr, "radio device numbers");
163MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards"); 164MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");
164MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr"); 165MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");
165MODULE_LICENSE("GPL"); 166MODULE_LICENSE("GPL");
167MODULE_VERSION(BTTV_VERSION);
166 168
167/* ----------------------------------------------------------------------- */ 169/* ----------------------------------------------------------------------- */
168/* sysfs */ 170/* sysfs */
@@ -2616,7 +2618,6 @@ static int bttv_querycap(struct file *file, void *priv,
2616 strlcpy(cap->card, btv->video_dev->name, sizeof(cap->card)); 2618 strlcpy(cap->card, btv->video_dev->name, sizeof(cap->card));
2617 snprintf(cap->bus_info, sizeof(cap->bus_info), 2619 snprintf(cap->bus_info, sizeof(cap->bus_info),
2618 "PCI:%s", pci_name(btv->c.pci)); 2620 "PCI:%s", pci_name(btv->c.pci));
2619 cap->version = BTTV_VERSION_CODE;
2620 cap->capabilities = 2621 cap->capabilities =
2621 V4L2_CAP_VIDEO_CAPTURE | 2622 V4L2_CAP_VIDEO_CAPTURE |
2622 V4L2_CAP_VBI_CAPTURE | 2623 V4L2_CAP_VBI_CAPTURE |
@@ -3416,7 +3417,6 @@ static int radio_querycap(struct file *file, void *priv,
3416 strcpy(cap->driver, "bttv"); 3417 strcpy(cap->driver, "bttv");
3417 strlcpy(cap->card, btv->radio_dev->name, sizeof(cap->card)); 3418 strlcpy(cap->card, btv->radio_dev->name, sizeof(cap->card));
3418 sprintf(cap->bus_info, "PCI:%s", pci_name(btv->c.pci)); 3419 sprintf(cap->bus_info, "PCI:%s", pci_name(btv->c.pci));
3419 cap->version = BTTV_VERSION_CODE;
3420 cap->capabilities = V4L2_CAP_TUNER; 3420 cap->capabilities = V4L2_CAP_TUNER;
3421 3421
3422 return 0; 3422 return 0;
@@ -4585,14 +4585,8 @@ static int __init bttv_init_module(void)
4585 4585
4586 bttv_num = 0; 4586 bttv_num = 0;
4587 4587
4588 printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n", 4588 printk(KERN_INFO "bttv: driver version %s loaded\n",
4589 (BTTV_VERSION_CODE >> 16) & 0xff, 4589 BTTV_VERSION);
4590 (BTTV_VERSION_CODE >> 8) & 0xff,
4591 BTTV_VERSION_CODE & 0xff);
4592#ifdef SNAPSHOT
4593 printk(KERN_INFO "bttv: snapshot date %04d-%02d-%02d\n",
4594 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
4595#endif
4596 if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME) 4590 if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME)
4597 gbuffers = 2; 4591 gbuffers = 2;
4598 if (gbufsize > BTTV_MAX_FBUF) 4592 if (gbufsize > BTTV_MAX_FBUF)