From 6e4561b0d53246745955c29c91f23937305273d8 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 27 Jul 2011 15:57:27 -0300
Subject: [PATCH] --- yaml --- r: 273647 b: refs/heads/master c:
 97a0a611e8dfa8f8f7c7b1c49239b0ab44cc3710 h: refs/heads/master i:   273645:
 7a17207a2c71c24f9b3224b3f9a87807667480b9   273643:
 17333d24cada186ac997673d8889c64301c799bb   273639:
 3b57a9bc5f479e6a44ecdab93713abb95d4495ce   273631:
 d1b82fd503be141e9e2364ab269b3c8f30a8e5a1 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/ov2640.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b5aa5ae4b4a1..d1a80d2c736a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db592a24656ec1028728eb4eccc450b925bea268
+refs/heads/master: 97a0a611e8dfa8f8f7c7b1c49239b0ab44cc3710
diff --git a/trunk/drivers/media/video/ov2640.c b/trunk/drivers/media/video/ov2640.c
index 78bf602296f7..31f361ed7cc5 100644
--- a/trunk/drivers/media/video/ov2640.c
+++ b/trunk/drivers/media/video/ov2640.c
@@ -300,7 +300,6 @@ struct ov2640_win_size {
 
 struct ov2640_priv {
 	struct v4l2_subdev		subdev;
-	struct ov2640_camera_info	*info;
 	enum v4l2_mbus_pixelcode	cfmt_code;
 	const struct ov2640_win_size	*win;
 	int				model;
@@ -1153,8 +1152,6 @@ static int ov2640_probe(struct i2c_client *client,
 		return -ENOMEM;
 	}
 
-	priv->info = icl->priv;
-
 	v4l2_i2c_subdev_init(&priv->subdev, client, &ov2640_subdev_ops);
 
 	icd->ops = &ov2640_ops;