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 gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
videodev.c
diff --git
a/drivers/media/video/videodev.c
b/drivers/media/video/videodev.c
index
0fc90cd
..
88bf2af
100644
(file)
--- a/
drivers/media/video/videodev.c
+++ b/
drivers/media/video/videodev.c
@@
-760,7
+760,7
@@
static int __video_do_ioctl(struct inode *inode, struct file *file,
ret=vfd->vidioc_overlay(file, fh, *i);
break;
}
-#ifdef CONFIG_V4L1_COMPAT
+#ifdef CONFIG_V
IDEO_V
4L1_COMPAT
/* --- streaming capture ------------------------------------- */
case VIDIOCGMBUF:
{