Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / include / media / v4l2-int-device.h

diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index 4e07707bd5eac1d597396dfa3cae91774d67ed8e..c8b80e0f065199e01102933d0ad4074075632782 100644 (file)
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -44,9 +44,8 @@ enum v4l2_int_type {
 struct v4l2_int_device;
 
 struct v4l2_int_master {
-       int (*attach)(struct v4l2_int_device *master,
-                     struct v4l2_int_device *slave);
-       void (*detach)(struct v4l2_int_device *master);
+       int (*attach)(struct v4l2_int_device *slave);
+       void (*detach)(struct v4l2_int_device *slave);
 };
 
 typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *);
@@ -187,12 +186,6 @@ enum v4l2_int_ioctl_num {
        vidioc_int_s_power_num,
        /* Get slave interface parameters. */
        vidioc_int_g_ifparm_num,
-       /* Get external clock speed for current slave settings. */
-       vidioc_int_g_ext_clk_num,
-       /*
-        * Tell what the generated interface clock speed actually is.
-        */
-       vidioc_int_s_ext_clk_num,
        /* Does the slave need to be reset after VIDIOC_DQBUF? */
        vidioc_int_g_needs_reset_num,
 
@@ -275,8 +268,6 @@ V4L2_INT_WRAPPER_0(dev_init);
 V4L2_INT_WRAPPER_0(dev_exit);
 V4L2_INT_WRAPPER_1(s_power, int, );
 V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);
-V4L2_INT_WRAPPER_1(s_ext_clk, u32, );
-V4L2_INT_WRAPPER_1(g_ext_clk, u32, *);
 V4L2_INT_WRAPPER_1(g_needs_reset, void, *);
 
 V4L2_INT_WRAPPER_0(reset);