camera: all sensor driver(ov3640/ov9650 exception) can be compiled success in rk30...

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

diff --git a/drivers/media/video/mt9d113.c b/drivers/media/video/mt9d113.c
index 191482da4d28609012dd7b7ee26ef02de312faf6..363aacd486e8e2c63410cad3c63fa16fed35b493 100755 (executable)
--- a/drivers/media/video/mt9d113.c
+++ b/drivers/media/video/mt9d113.c
@@ -20,7 +20,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
-#include <mach/rk29_camera.h>
+#include <plat/rk_camera.h>
 #include "mt9d113.h"
 
 static int debug;
@@ -69,7 +69,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_Scene         0
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Exposure      0
-#define CONFIG_SENSOR_Flash         0
+#define CONFIG_SENSOR_Flash         1
 #define CONFIG_SENSOR_Mirror        0
 #define CONFIG_SENSOR_Flip          0
 #define CONFIG_SENSOR_Focus         0
@@ -2921,7 +2921,7 @@ static long sensor_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
        struct i2c_client *client = v4l2_get_subdevdata(sd);
     struct soc_camera_device *icd = client->dev.platform_data;
     struct sensor *sensor = to_sensor(client);
-    int ret = 0;
+    int ret = 0,i;
     
        SENSOR_DG("\n%s..%s..cmd:%x \n",SENSOR_NAME_STRING(),__FUNCTION__,cmd);
        switch (cmd)