OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[android-x86/kernel.git]
/
drivers
/
media
/
video
/
omap
/
omap_vout.c
diff --git
a/drivers/media/video/omap/omap_vout.c
b/drivers/media/video/omap/omap_vout.c
index
21d7c0d
..
029a4ba
100644
(file)
--- a/
drivers/media/video/omap/omap_vout.c
+++ b/
drivers/media/video/omap/omap_vout.c
@@
-2230,7
+2230,6
@@
static int __init omap_vout_setup_video_data(struct omap_vout_device *vout)
strlcpy(vfd->name, VOUT_NAME, sizeof(vfd->name));
- /* need to register for a VID_HARDWARE_* ID in videodev.h */
vfd->fops = &omap_vout_fops;
vfd->v4l2_dev = &vout->vid_dev->v4l2_dev;
mutex_init(&vout->lock);