git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran
/
zoran.h
diff --git
a/drivers/media/video/zoran/zoran.h
b/drivers/media/video/zoran/zoran.h
index
afecf32
..
d439c76
100644
(file)
--- a/
drivers/media/video/zoran/zoran.h
+++ b/
drivers/media/video/zoran/zoran.h
@@
-143,8
+143,8
@@
Private IOCTL to set up for displaying MJPEG
#ifdef __KERNEL__
#define MAJOR_VERSION 0 /* driver major version */
#ifdef __KERNEL__
#define MAJOR_VERSION 0 /* driver major version */
-#define MINOR_VERSION
9
/* driver minor version */
-#define RELEASE_VERSION
5
/* release version */
+#define MINOR_VERSION
10
/* driver minor version */
+#define RELEASE_VERSION
0
/* release version */
#define ZORAN_NAME "ZORAN" /* name of the device */
#define ZORAN_NAME "ZORAN" /* name of the device */