git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
media
/
video
/
sn9c102
/
sn9c102_core.c
diff --git
a/drivers/media/video/sn9c102/sn9c102_core.c
b/drivers/media/video/sn9c102/sn9c102_core.c
index
ea4394d
..
48d138a
100644
(file)
--- a/
drivers/media/video/sn9c102/sn9c102_core.c
+++ b/
drivers/media/video/sn9c102/sn9c102_core.c
@@
-2608,11
+2608,9
@@
static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
case VIDIOC_G_CTRL:
return sn9c102_vidioc_g_ctrl(cam, arg);
case VIDIOC_G_CTRL:
return sn9c102_vidioc_g_ctrl(cam, arg);
- case VIDIOC_S_CTRL_OLD:
case VIDIOC_S_CTRL:
return sn9c102_vidioc_s_ctrl(cam, arg);
case VIDIOC_S_CTRL:
return sn9c102_vidioc_s_ctrl(cam, arg);
- case VIDIOC_CROPCAP_OLD:
case VIDIOC_CROPCAP:
return sn9c102_vidioc_cropcap(cam, arg);
case VIDIOC_CROPCAP:
return sn9c102_vidioc_cropcap(cam, arg);
@@
-2659,7
+2657,6
@@
static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
case VIDIOC_G_PARM:
return sn9c102_vidioc_g_parm(cam, arg);
case VIDIOC_G_PARM:
return sn9c102_vidioc_g_parm(cam, arg);
- case VIDIOC_S_PARM_OLD:
case VIDIOC_S_PARM:
return sn9c102_vidioc_s_parm(cam, arg);
case VIDIOC_S_PARM:
return sn9c102_vidioc_s_parm(cam, arg);