Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk_camsys / camsys_soc_rk3288.c

diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
index 41048d950a8e495b42147fe95ff5c34cbd64e060..a1d008f2b4affac02cbefdd5af35a9a8215316b2 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
@@ -60,12 +60,12 @@ static int camsys_rk3288_mipiphy0_wr_reg(unsigned char addr, unsigned char data)
     }
     return 0;
 }
-
+#if 0
 static int camsys_rk3288_mipiphy0_rd_reg(unsigned char addr)
 {
     return read_grf_reg(GRF_SOC_STATUS21);
 }
-
+#endif
 static int camsys_rk3288_mipiphy1_wr_reg(unsigned int phy_virt,unsigned char addr, unsigned char data)
 {