diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index cef4f282e5aa..1db97f3a1975 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -45,6 +45,7 @@ | |||
45 | MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); | 45 | MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); |
46 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); | 46 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); |
47 | MODULE_LICENSE("GPL"); | 47 | MODULE_LICENSE("GPL"); |
48 | MODULE_VERSION(CX88_VERSION); | ||
48 | 49 | ||
49 | /* ------------------------------------------------------------------ */ | 50 | /* ------------------------------------------------------------------ */ |
50 | 51 | ||
@@ -1161,7 +1162,6 @@ static int vidioc_querycap (struct file *file, void *priv, | |||
1161 | strcpy(cap->driver, "cx8800"); | 1162 | strcpy(cap->driver, "cx8800"); |
1162 | strlcpy(cap->card, core->board.name, sizeof(cap->card)); | 1163 | strlcpy(cap->card, core->board.name, sizeof(cap->card)); |
1163 | sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); | 1164 | sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); |
1164 | cap->version = CX88_VERSION_CODE; | ||
1165 | cap->capabilities = | 1165 | cap->capabilities = |
1166 | V4L2_CAP_VIDEO_CAPTURE | | 1166 | V4L2_CAP_VIDEO_CAPTURE | |
1167 | V4L2_CAP_READWRITE | | 1167 | V4L2_CAP_READWRITE | |
@@ -1480,7 +1480,6 @@ static int radio_querycap (struct file *file, void *priv, | |||
1480 | strcpy(cap->driver, "cx8800"); | 1480 | strcpy(cap->driver, "cx8800"); |
1481 | strlcpy(cap->card, core->board.name, sizeof(cap->card)); | 1481 | strlcpy(cap->card, core->board.name, sizeof(cap->card)); |
1482 | sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); | 1482 | sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); |
1483 | cap->version = CX88_VERSION_CODE; | ||
1484 | cap->capabilities = V4L2_CAP_TUNER; | 1483 | cap->capabilities = V4L2_CAP_TUNER; |
1485 | return 0; | 1484 | return 0; |
1486 | } | 1485 | } |
@@ -2139,14 +2138,8 @@ static struct pci_driver cx8800_pci_driver = { | |||
2139 | 2138 | ||
2140 | static int __init cx8800_init(void) | 2139 | static int __init cx8800_init(void) |
2141 | { | 2140 | { |
2142 | printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n", | 2141 | printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %s loaded\n", |
2143 | (CX88_VERSION_CODE >> 16) & 0xff, | 2142 | CX88_VERSION); |
2144 | (CX88_VERSION_CODE >> 8) & 0xff, | ||
2145 | CX88_VERSION_CODE & 0xff); | ||
2146 | #ifdef SNAPSHOT | ||
2147 | printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n", | ||
2148 | SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); | ||
2149 | #endif | ||
2150 | return pci_register_driver(&cx8800_pci_driver); | 2143 | return pci_register_driver(&cx8800_pci_driver); |
2151 | } | 2144 | } |
2152 | 2145 | ||
@@ -2157,11 +2150,3 @@ static void __exit cx8800_fini(void) | |||
2157 | 2150 | ||
2158 | module_init(cx8800_init); | 2151 | module_init(cx8800_init); |
2159 | module_exit(cx8800_fini); | 2152 | module_exit(cx8800_fini); |
2160 | |||
2161 | /* ----------------------------------------------------------- */ | ||
2162 | /* | ||
2163 | * Local variables: | ||
2164 | * c-basic-offset: 8 | ||
2165 | * End: | ||
2166 | * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off | ||
2167 | */ | ||