Merge branch 'origin' into for-linus

[karo-tx-linux.git] / include / media / tvp514x.h

diff --git a/include/media/tvp514x.h b/include/media/tvp514x.h
index 5e7ee968c6dcd58b01de4d394ea4b89875889d09..74387e83f5b950839170625e71db332bbc882fdc 100644 (file)
--- a/include/media/tvp514x.h
+++ b/include/media/tvp514x.h
@@ -104,10 +104,6 @@ enum tvp514x_output {
  * @ vs_polarity: VSYNC Polarity configuration for current interface.
  */
 struct tvp514x_platform_data {
-       char *master;
-       int (*power_set) (enum v4l2_power on);
-       int (*ifparm) (struct v4l2_ifparm *p);
-       int (*priv_data_set) (void *);
        /* Interface control params */
        bool clk_polarity;
        bool hs_polarity;