Merge branch 'master' into queue

[firefly-linux-kernel-4.4.55.git] / include / media / tvp514x.h

diff --git a/include/media/tvp514x.h b/include/media/tvp514x.h
index 74387e83f5b950839170625e71db332bbc882fdc..86ed7e8068304e1c44bc9a59d95c59e655940a82 100644 (file)
--- a/include/media/tvp514x.h
+++ b/include/media/tvp514x.h
@@ -96,12 +96,9 @@ enum tvp514x_output {
 
 /**
  * struct tvp514x_platform_data - Platform data values and access functions.
- * @power_set: Power state access function, zero is off, non-zero is on.
- * @ifparm: Interface parameters access function.
- * @priv_data_set: Device private data (pointer) access function.
  * @clk_polarity: Clock polarity of the current interface.
- * @ hs_polarity: HSYNC Polarity configuration for current interface.
- * @ vs_polarity: VSYNC Polarity configuration for current interface.
+ * @hs_polarity: HSYNC Polarity configuration for current interface.
+ * @vs_polarity: VSYNC Polarity configuration for current interface.
  */
 struct tvp514x_platform_data {
        /* Interface control params */