projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86748f3
)
[media] v4l2-ioctl.c: remove an unnecessary #ifdef
author
Hans Verkuil
<hans.verkuil@cisco.com>
Sat, 9 Jun 2012 13:00:51 +0000
(10:00 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Fri, 6 Jul 2012 20:18:38 +0000
(17:18 -0300)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-ioctl.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/v4l2-ioctl.c
b/drivers/media/video/v4l2-ioctl.c
index 7a15f351395f507f72ecc1ddab37306fbb9518e6..be89dade6e2c9ed87584d9d8aee3a3a0b4617d13 100644
(file)
--- a/
drivers/media/video/v4l2-ioctl.c
+++ b/
drivers/media/video/v4l2-ioctl.c
@@
-506,10
+506,8
@@
static struct v4l2_ioctl_info v4l2_ioctls[] = {
IOCTL_INFO(VIDIOC_TRY_ENCODER_CMD, INFO_FL_CLEAR(v4l2_encoder_cmd, flags)),
IOCTL_INFO(VIDIOC_DECODER_CMD, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_TRY_DECODER_CMD, 0),
-#ifdef CONFIG_VIDEO_ADV_DEBUG
IOCTL_INFO(VIDIOC_DBG_S_REGISTER, 0),
IOCTL_INFO(VIDIOC_DBG_G_REGISTER, 0),
-#endif
IOCTL_INFO(VIDIOC_DBG_G_CHIP_IDENT, 0),
IOCTL_INFO(VIDIOC_S_HW_FREQ_SEEK, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_ENUM_DV_PRESETS, 0),