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

diff --git a/drivers/media/video/gc0307.c b/drivers/media/video/gc0307.c
index baff822d39d79120bc68893dd3eca9a6cbfdb398..bacf9b53e697fd59df2ce0d581c9e2fa3e38bca3 100755 (executable)
--- a/drivers/media/video/gc0307.c
+++ b/drivers/media/video/gc0307.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -65,7 +65,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/gc0308.c b/drivers/media/video/gc0308.c
index 033f533780dce659c6e126a9ad0fcbaf6aea26da..e4e5ed9d54ad6d0a3892d68985faa8a4b403ade5 100755 (executable)
--- a/drivers/media/video/gc0308.c
+++ b/drivers/media/video/gc0308.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -65,7 +65,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/gc0309.c b/drivers/media/video/gc0309.c
index 0ee641e8c7cf4354f54c8deff4487f5e5ef6ba3e..36e31aeee78f3155f4439a00be5cde0656b6252f 100755 (executable)
--- a/drivers/media/video/gc0309.c
+++ b/drivers/media/video/gc0309.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/gc0309_for_td8801.c b/drivers/media/video/gc0309_for_td8801.c
index f23c4d81a15f5da75df334b0e0718c90c684d943..74ebdbfbc2c3dbdded5949b8edc4ce292efafd41 100644 (file)
--- a/drivers/media/video/gc0309_for_td8801.c
+++ b/drivers/media/video/gc0309_for_td8801.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/drivers/media/video/gc2015.c b/drivers/media/video/gc2015.c
index b31ed13207be8e77ddb3eead0c1affca6306d630..f98bf8e16c45df52531d55400d27a9fdb7128dd2 100755 (executable)
--- a/drivers/media/video/gc2015.c
+++ b/drivers/media/video/gc2015.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/gt2005.c b/drivers/media/video/gt2005.c
index 6ecc115b6b1fba579aaf24559842fd1efeab3a60..5eeb8d5a8ffd7cecb6ec2ac75cc6a19cf149388f 100755 (executable)
--- a/drivers/media/video/gt2005.c
+++ b/drivers/media/video/gt2005.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/hi253.c b/drivers/media/video/hi253.c
index 343a22c73c98e38cf9bc5e4084d009a2c33914ac..aef2d41b4d733647317f57ffdf13f8d721bb7613 100755 (executable)
--- a/drivers/media/video/hi253.c
+++ b/drivers/media/video/hi253.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/drivers/media/video/hi704.c b/drivers/media/video/hi704.c
index 6c2c2659cd3680e7eb49f1c9dad145e97061f9a9..b52826dc87fe68a5be3c195e3fd0038fde050be8 100755 (executable)
--- a/drivers/media/video/hi704.c
+++ b/drivers/media/video/hi704.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/drivers/media/video/mt9d112.c b/drivers/media/video/mt9d112.c
index 997657e0d71e26dfba3d36fdb4cd34608995f235..84736231015871158b86b2891372bd15f6b165e8 100755 (executable)
--- a/drivers/media/video/mt9d112.c
+++ b/drivers/media/video/mt9d112.c
@@ -19,7 +19,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 "mt9d112.h"
 
 static int debug;
@@ -66,7 +66,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_Scene         1
 #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

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)

diff --git a/drivers/media/video/mt9m112.c b/drivers/media/video/mt9m112.c
index 348fe2ad798070055902181fa25e153a2417aad5..bfa12354e1bba34948f8ae4aa8dc99fe227014b0 100755 (executable)
--- a/drivers/media/video/mt9m112.c
+++ b/drivers/media/video/mt9m112.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 "mt9m112.h"
 
 static int debug;

diff --git a/drivers/media/video/mt9p111.c b/drivers/media/video/mt9p111.c
index b5bf570adf797343c93987d16bec09f6d1d4265c..99bfc78e6b400f3af4c4dff862de5528d6fca639 100644 (file)
--- a/drivers/media/video/mt9p111.c
+++ b/drivers/media/video/mt9p111.c
@@ -22,7 +22,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 "mt9p111.h"
 
 static int debug;

diff --git a/drivers/media/video/mt9t111.c b/drivers/media/video/mt9t111.c
index ce2575e0f327ebb9e805090bab00699d6555a074..bb59b180e6ea085e6b0665a54d70f5944cd6da87 100755 (executable)
--- a/drivers/media/video/mt9t111.c
+++ b/drivers/media/video/mt9t111.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 "mt9t111.h"
 
 static int debug;

diff --git a/drivers/media/video/nt99250.c b/drivers/media/video/nt99250.c
index 4aaaecee8aff4a840b11b6b6ab032c4c31b67a93..56f80d267d704b53513b5e22de36503ef7a9b951 100755 (executable)
--- a/drivers/media/video/nt99250.c
+++ b/drivers/media/video/nt99250.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/drivers/media/video/ov2640_rk.c b/drivers/media/video/ov2640_rk.c
index d964b6d0e4aa6c7e2a7413503edab59b149a4cff..8a0ec04b234b04e3ec146ac586c8248f8a9fdc45 100755 (executable)
--- a/drivers/media/video/ov2640_rk.c
+++ b/drivers/media/video/ov2640_rk.c
@@ -9,7 +9,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>\r
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -55,7 +55,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         0
 #define CONFIG_SENSOR_Exposure      0
-#define CONFIG_SENSOR_Flash         0
+#define CONFIG_SENSOR_Flash         1\r
 #define CONFIG_SENSOR_Mirror        0
 #define CONFIG_SENSOR_Flip          0
 
@@ -2824,7 +2824,7 @@ static long sensor_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
        struct i2c_client *client = v4l2_get_subdevdata(sd);\r
     struct soc_camera_device *icd = client->dev.platform_data;  
     struct sensor *sensor = to_sensor(client);
-    int ret = 0;
+    int ret = 0,i;\r
     
        SENSOR_DG("\n%s..%s..cmd:%x \n",SENSOR_NAME_STRING(),__FUNCTION__,cmd);
        switch (cmd)

diff --git a/drivers/media/video/ov5640.c b/drivers/media/video/ov5640.c
index cce82b537922f1158d69933dbd1ebddef30a9cc4..4823c2151146d52b5b446fb617613bb0fae8f54d 100755 (executable)
--- a/drivers/media/video/ov5640.c
+++ b/drivers/media/video/ov5640.c
@@ -19,7 +19,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 "ov5640.h"
 
 static int debug;
@@ -63,7 +63,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_Scene         1
 #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
 #ifdef CONFIG_OV5640_AUTOFOCUS
@@ -3778,7 +3778,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)

diff --git a/drivers/media/video/ov5640_for_td8801.c b/drivers/media/video/ov5640_for_td8801.c
index 2c97f4dbd928fff81abd84f31959c0775c12effb..2f9bdd3185f0ab183b4c1b664201fa6d50c14bd3 100644 (file)
--- a/drivers/media/video/ov5640_for_td8801.c
+++ b/drivers/media/video/ov5640_for_td8801.c
@@ -19,7 +19,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 "ov5640.h"
 
 static int debug = 1;

diff --git a/drivers/media/video/ov7675.c b/drivers/media/video/ov7675.c
index a94b2d1f8da45f11d6b5eb867e841242c914ad9c..e4a80fec0789d9f2e6b346d0ae2eb506d6aa9d00 100755 (executable)
--- a/drivers/media/video/ov7675.c
+++ b/drivers/media/video/ov7675.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -65,7 +65,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/ov7690.c b/drivers/media/video/ov7690.c
index 3e9884ec330b1bb405d0df48ffe95b2912bdcbe9..f50d8b1650463cf2fc3a8897f0e41aab87f6941c 100644 (file)
--- a/drivers/media/video/ov7690.c
+++ b/drivers/media/video/ov7690.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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
 

diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c
index cfe412a1733d762ad5af03dc1611388147f2052e..3d423404b948173a7e13ffc5da9b984178375cde 100644 (file)
--- a/drivers/media/video/s5k6aa.c
+++ b/drivers/media/video/s5k6aa.c
@@ -19,7 +19,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 <linux/delay.h>
 #include "s5k6aa.h"
 static int debug;

diff --git a/drivers/media/video/sid130B.c b/drivers/media/video/sid130B.c
index 0827afef9d8dab89a3d3308529594908437e0c50..5bfbb0add50668a63dd0cbf18029035379d0408d 100755 (executable)
--- a/drivers/media/video/sid130B.c
+++ b/drivers/media/video/sid130B.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #include <media/v4l2-common.h>\r
 #include <media/v4l2-chip-ident.h>\r
 #include <media/soc_camera.h>\r
-#include <mach/rk29_camera.h>\r
+#include <plat/rk_camera.h>\r
 \r
 static int debug;\r
 module_param(debug, int, S_IRUGO|S_IWUSR);\r
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0\r
 #define CONFIG_SENSOR_Focus         0\r
 #define CONFIG_SENSOR_Exposure      0\r
-#define CONFIG_SENSOR_Flash         0\r
+#define CONFIG_SENSOR_Flash         1\r
 #define CONFIG_SENSOR_Mirror        0\r
 #define CONFIG_SENSOR_Flip          0\r
 \r
@@ -1800,7 +1800,6 @@ static int sensor_init(struct v4l2_subdev *sd, u32 val)
        #endif\r
 \r
        #if CONFIG_SENSOR_Flash\r
-       sensor_set_flash();\r
        qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_FLASH);\r
        if (qctrl)\r
         sensor->info_priv.flash = qctrl->default_value;\r
@@ -2049,7 +2048,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
 \r
     if ((int)winseqe_set_addr  != sensor->info_priv.winseqe_cur_addr) {\r
         #if CONFIG_SENSOR_Flash\r
-        if (sensor_fmt_capturechk(sd,f) == true) {      /* ddl@rock-chips.com : Capture */\r
+        if (sensor_fmt_capturechk(sd,mf) == true) {      /* ddl@rock-chips.com : Capture */\r
             if ((sensor->info_priv.flash == 1) || (sensor->info_priv.flash == 2)) {\r
                 sensor_ioctrl(icd, Sensor_Flash, Flash_On);\r
                 SENSOR_DG("%s flash on in capture!\n", SENSOR_NAME_STRING());\r
@@ -2065,7 +2064,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
         if (ret != 0) {\r
             SENSOR_TR("%s set format capability failed\n", SENSOR_NAME_STRING());\r
             #if CONFIG_SENSOR_Flash\r
-            if (sensor_fmt_capturechk(sd,f) == true) {\r
+            if (sensor_fmt_capturechk(sd,mf) == true) {\r
                 if ((sensor->info_priv.flash == 1) || (sensor->info_priv.flash == 2)) {\r
                     sensor_ioctrl(icd, Sensor_Flash, Flash_Off);\r
                     SENSOR_TR("%s Capture format set fail, flash off !\n", SENSOR_NAME_STRING());\r

diff --git a/drivers/media/video/siv120b.c b/drivers/media/video/siv120b.c
index bfea1e0d6827bddf747f09872a71fadbb682acb7..4b204e1ac08495c1bd19781f7bdeb3e262450a99 100755 (executable)
--- a/drivers/media/video/siv120b.c
+++ b/drivers/media/video/siv120b.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #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>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -65,7 +65,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0
 #define CONFIG_SENSOR_Focus         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