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 'viafb-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
meye.c
diff --git
a/drivers/media/video/meye.c
b/drivers/media/video/meye.c
index
48d2c24
..
b09a3c8
100644
(file)
--- a/
drivers/media/video/meye.c
+++ b/
drivers/media/video/meye.c
@@
-1547,7
+1547,8
@@
static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
return 0;
}
-static long vidioc_default(struct file *file, void *fh, int cmd, void *arg)
+static long vidioc_default(struct file *file, void *fh, bool valid_prio,
+ int cmd, void *arg)
{
switch (cmd) {
case MEYEIOC_G_PARAMS: