Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[~andy/linux] / include / media / davinci / vpbe.h

diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h
index a7ca4884c46cc8a386a42a7d9f9eaae6c35dc8ba..57585c7004a4503d1a3a5f70973f53b29555926d 100644 (file)
--- a/include/media/davinci/vpbe.h
+++ b/include/media/davinci/vpbe.h
@@ -132,7 +132,7 @@ struct vpbe_device_ops {
                               struct v4l2_enum_dv_timings *timings_info);
 
        /* Set std at the output */
-       int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id);
+       int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id std_id);
 
        /* Get the current std at the output */
        int (*g_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id);