projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'md/3.13' of git://neil.brown.name/md
[firefly-linux-kernel-4.4.55.git]
/
include
/
media
/
v4l2-int-device.h
diff --git
a/include/media/v4l2-int-device.h
b/include/media/v4l2-int-device.h
index e6aa2318367baa39bff7c260b828cfab15c4d8ac..0286c95814ffa42d32134f81c703b13a91b84638 100644
(file)
--- a/
include/media/v4l2-int-device.h
+++ b/
include/media/v4l2-int-device.h
@@
-220,8
+220,6
@@
enum v4l2_int_ioctl_num {
vidioc_int_reset_num,
/* VIDIOC_INT_INIT */
vidioc_int_init_num,
- /* VIDIOC_DBG_G_CHIP_IDENT */
- vidioc_int_g_chip_ident_num,
/*
*
@@
-303,6
+301,5
@@
V4L2_INT_WRAPPER_1(enum_frameintervals, struct v4l2_frmivalenum, *);
V4L2_INT_WRAPPER_0(reset);
V4L2_INT_WRAPPER_0(init);
-V4L2_INT_WRAPPER_1(g_chip_ident, int, *);
#endif