From b3a874241d4a42022665d932736f989e9eaa9969 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 20 Apr 2012 12:22:50 -0300
Subject: [PATCH] --- yaml --- r: 300244 b: refs/heads/master c:
 9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/marvell-ccic/mmp-driver.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3603a9b8109..f080ec46c373 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f9a0c880d5c1e159f647950a2eed26618ad2ff1
+refs/heads/master: 9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77
diff --git a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c b/trunk/drivers/media/video/marvell-ccic/mmp-driver.c
index d23552323f45..c4c17fe76c0d 100644
--- a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/trunk/drivers/media/video/marvell-ccic/mmp-driver.c
@@ -181,7 +181,6 @@ static int mmpcam_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&cam->devlist);
 
 	mcam = &cam->mcam;
-	mcam->platform = MHP_Armada610;
 	mcam->plat_power_up = mmpcam_power_up;
 	mcam->plat_power_down = mmpcam_power_down;
 	mcam->dev = &pdev->dev;