Merge remote-tracking branch 'asoc/topic/core' into asoc-next

[~andy/linux] / drivers / media / i2c / soc_camera / ov9640.h

diff --git a/drivers/media/i2c/soc_camera/ov9640.h b/drivers/media/i2c/soc_camera/ov9640.h
index 6b33a972c83ca1fa2c4ea275a9376a288deaf8ed..65d13ff1753630eae190cc446e7e39bcbe0ed94a 100644 (file)
--- a/drivers/media/i2c/soc_camera/ov9640.h
+++ b/drivers/media/i2c/soc_camera/ov9640.h
@@ -199,6 +199,7 @@ struct ov9640_reg {
 struct ov9640_priv {
        struct v4l2_subdev              subdev;
        struct v4l2_ctrl_handler        hdl;
+       struct v4l2_clk                 *clk;
 
        int                             model;
        int                             revision;