[media] marvell-cam: fix an ARM build error
authorJonathan Corbet <corbet@lwn.net>
Fri, 20 Apr 2012 15:22:50 +0000 (12:22 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 26 Apr 2012 18:30:54 +0000 (15:30 -0300)
One of the OLPC changes lost a little in its translation to mainline,
leading to build errors on the ARM architecture.  Remove the offending
line, and all will be well.

Reported-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/marvell-ccic/mmp-driver.c

index d23552323f456b0bffffeff508478921c29e9dab..c4c17fe76c0d5e0319c11947d9b7e062e3014b7d 100644 (file)
@@ -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;