aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-27 21:28:38 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:15 -0400
commitb0eaab765794bf4fdf060c74b21c9851ba3c6907 (patch)
tree363c612ff0ac7b8768cb4dca03f62586f186c415 /drivers/media
parentfd3e5824824d1beaf376cd523c7418c5570851d4 (diff)
[media] gspca: don't include linux/version.h
Instead of handling a per-driver driver version, use the per-subsystem one. As reviewed by Jean-Francois Moine <moinejf@free.fr>: - the 'info' may be simplified: Reviewed-by: Jean-Francois Moine <moinejf@free.fr> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/gspca.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 08ce9948d99b..d0b79a9f88b7 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -24,7 +24,6 @@
24#define MODULE_NAME "gspca" 24#define MODULE_NAME "gspca"
25 25
26#include <linux/init.h> 26#include <linux/init.h>
27#include <linux/version.h>
28#include <linux/fs.h> 27#include <linux/fs.h>
29#include <linux/vmalloc.h> 28#include <linux/vmalloc.h>
30#include <linux/sched.h> 29#include <linux/sched.h>
@@ -51,11 +50,12 @@
51#error "DEF_NURBS too big" 50#error "DEF_NURBS too big"
52#endif 51#endif
53 52
53#define DRIVER_VERSION_NUMBER "2.13.0"
54
54MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>"); 55MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
55MODULE_DESCRIPTION("GSPCA USB Camera Driver"); 56MODULE_DESCRIPTION("GSPCA USB Camera Driver");
56MODULE_LICENSE("GPL"); 57MODULE_LICENSE("GPL");
57 58MODULE_VERSION(DRIVER_VERSION_NUMBER);
58#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 13, 0)
59 59
60#ifdef GSPCA_DEBUG 60#ifdef GSPCA_DEBUG
61int gspca_debug = D_ERR | D_PROBE; 61int gspca_debug = D_ERR | D_PROBE;
@@ -1291,7 +1291,6 @@ static int vidioc_querycap(struct file *file, void *priv,
1291 } 1291 }
1292 usb_make_path(gspca_dev->dev, (char *) cap->bus_info, 1292 usb_make_path(gspca_dev->dev, (char *) cap->bus_info,
1293 sizeof(cap->bus_info)); 1293 sizeof(cap->bus_info));
1294 cap->version = DRIVER_VERSION_NUMBER;
1295 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE 1294 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
1296 | V4L2_CAP_STREAMING 1295 | V4L2_CAP_STREAMING
1297 | V4L2_CAP_READWRITE; 1296 | V4L2_CAP_READWRITE;
@@ -2478,10 +2477,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
2478/* -- module insert / remove -- */ 2477/* -- module insert / remove -- */
2479static int __init gspca_init(void) 2478static int __init gspca_init(void)
2480{ 2479{
2481 info("v%d.%d.%d registered", 2480 info("v" DRIVER_VERSION_NUMBER " registered");
2482 (DRIVER_VERSION_NUMBER >> 16) & 0xff,
2483 (DRIVER_VERSION_NUMBER >> 8) & 0xff,
2484 DRIVER_VERSION_NUMBER & 0xff);
2485 return 0; 2481 return 0;
2486} 2482}
2487static void __exit gspca_exit(void) 2483static void __exit gspca_exit(void)