Merge branch android-common-3.10

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

diff --git a/drivers/media/video/sid130B.c b/drivers/media/video/sid130B.c
index 13f75d6d51b9c47cd3b03126825a5f7b45654c60..a022859546cfcb993a463d208fa00ab26539bd9a 100755 (executable)
--- a/drivers/media/video/sid130B.c
+++ b/drivers/media/video/sid130B.c
@@ -1897,7 +1897,7 @@ static struct reginfo sensor_Zoom3[] =
 };\r
 static struct reginfo *sensor_ZoomSeqe[] = {sensor_Zoom0, sensor_Zoom1, sensor_Zoom2, sensor_Zoom3, NULL,};\r
 #endif\r
-static const struct v4l2_querymenu sensor_menus[] =\r
+static  struct v4l2_querymenu sensor_menus[] =\r
 {\r
        #if CONFIG_SENSOR_WhiteBalance\r
     { .id = V4L2_CID_DO_WHITE_BALANCE,  .index = 0,  .name = "auto",  .reserved = 0, }, {  .id = V4L2_CID_DO_WHITE_BALANCE,  .index = 1, .name = "incandescent",  .reserved = 0,},\r
@@ -2250,7 +2250,7 @@ static int sensor_write(struct i2c_client *client, u8 reg, u8 val)
 \r
     return err;\r
 }\r
-\r
+#if 0\r
 /* sensor register read */\r
 static int sensor_read(struct i2c_client *client, u8 reg, u8 *val)\r
 {\r
@@ -2291,7 +2291,7 @@ static int sensor_read(struct i2c_client *client, u8 reg, u8 *val)
 \r
     return err;\r
 }\r
-\r
+#endif\r
 /* write a array of registers  */\r
 static int sensor_write_array(struct i2c_client *client, struct reginfo *regarray)\r
 {\r