diff options
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 5bb75294b5aa..d545c98dd5e7 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -333,7 +333,7 @@ struct vino_settings { | |||
333 | * | 333 | * |
334 | * Use non-zero value to enable conversion. | 334 | * Use non-zero value to enable conversion. |
335 | */ | 335 | */ |
336 | static int vino_pixel_conversion = 0; | 336 | static int vino_pixel_conversion; |
337 | 337 | ||
338 | module_param_named(pixelconv, vino_pixel_conversion, int, 0); | 338 | module_param_named(pixelconv, vino_pixel_conversion, int, 0); |
339 | 339 | ||
@@ -4370,8 +4370,8 @@ static int vino_ioctl(struct inode *inode, struct file *file, | |||
4370 | 4370 | ||
4371 | /* Initialization and cleanup */ | 4371 | /* Initialization and cleanup */ |
4372 | 4372 | ||
4373 | // __initdata | 4373 | /* __initdata */ |
4374 | static int vino_init_stage = 0; | 4374 | static int vino_init_stage; |
4375 | 4375 | ||
4376 | static const struct file_operations vino_fops = { | 4376 | static const struct file_operations vino_fops = { |
4377 | .owner = THIS_MODULE, | 4377 | .owner = THIS_MODULE, |
@@ -4385,8 +4385,8 @@ static const struct file_operations vino_fops = { | |||
4385 | 4385 | ||
4386 | static struct video_device v4l_device_template = { | 4386 | static struct video_device v4l_device_template = { |
4387 | .name = "NOT SET", | 4387 | .name = "NOT SET", |
4388 | //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | | 4388 | /*.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */ |
4389 | // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY | 4389 | /* VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */ |
4390 | .fops = &vino_fops, | 4390 | .fops = &vino_fops, |
4391 | .minor = -1, | 4391 | .minor = -1, |
4392 | }; | 4392 | }; |