Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271908
b: refs/heads/master
c: f22123f
h: refs/heads/master
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Sep 24, 2011
1 parent 85dcc49 commit 082cfd7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 114cfbdf49166d715d51d5c01c1fa4fcdba99e19
refs/heads/master: f22123faeda46cdd6a8586316a96543f90d9aba8
8 changes: 3 additions & 5 deletions trunk/drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "gspca"
#define GSPCA_VERSION "2.14.0"

#include <linux/init.h>
#include <linux/fs.h>
Expand Down Expand Up @@ -52,12 +52,10 @@
#error "DEF_NURBS too big"
#endif

#define DRIVER_VERSION_NUMBER "2.13.0"

MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
MODULE_DESCRIPTION("GSPCA USB Camera Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRIVER_VERSION_NUMBER);
MODULE_VERSION(GSPCA_VERSION);

#ifdef GSPCA_DEBUG
int gspca_debug = D_ERR | D_PROBE;
Expand Down Expand Up @@ -2568,7 +2566,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
/* -- module insert / remove -- */
static int __init gspca_init(void)
{
pr_info("v" DRIVER_VERSION_NUMBER " registered\n");
pr_info("v" GSPCA_VERSION " registered\n");
return 0;
}
static void __exit gspca_exit(void)
Expand Down

0 comments on commit 082cfd7

Please sign in to comment.