summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorYuxi Sun <b36102@freescale.com>2011-04-26 13:44:40 +0800
committerJason Liu <r64343@freescale.com>2012-01-09 20:08:25 +0800
commit969e304a9125bacf876bdee9be55e2d5ccc42f80 (patch)
tree792cafdfa34f4d1d1293eef4993102d96c032a23 /drivers/media
parent2292d32d291c82b060b4d0b0ec7d2f746de0fbe0 (diff)
ENGR00142517-2 camera clk initialization
Modified camera clk initialization and camera platform data name to coincide with history. Signed-off-by: Sun Yuxi <b36102@freescale.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/mxc/capture/ov3640.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov3640.c b/drivers/media/video/mxc/capture/ov3640.c
index dc93b7234cea..189a5f52d913 100644
--- a/drivers/media/video/mxc/capture/ov3640.c
+++ b/drivers/media/video/mxc/capture/ov3640.c
@@ -696,7 +696,7 @@ static struct regulator *io_regulator;
static struct regulator *core_regulator;
static struct regulator *analog_regulator;
static struct regulator *gpo_regulator;
-static struct mxc_camera_platform_data *camera_plat;
+static struct fsl_mxc_camera_platform_data *camera_plat;
static int ov3640_probe(struct i2c_client *adapter,
const struct i2c_device_id *device_id);
@@ -1318,7 +1318,7 @@ static int ov3640_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int retval;
- struct mxc_camera_platform_data *plat_data = client->dev.platform_data;
+ struct fsl_mxc_camera_platform_data *plat_data = client->dev.platform_data;
/* Set initial values for the sensor struct. */
memset(&ov3640_data, 0, sizeof(ov3640_data));