| From 9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77 Mon Sep 17 00:00:00 2001 |
| From: Jonathan Corbet <corbet@lwn.net> |
| Date: Fri, 20 Apr 2012 12:22:50 -0300 |
| Subject: media: marvell-cam: fix an ARM build error |
| |
| From: Jonathan Corbet <corbet@lwn.net> |
| |
| commit 9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77 upstream. |
| |
| 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> |
| Signed-off-by: Jonathan Corbet <corbet@lwn.net> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/video/marvell-ccic/mmp-driver.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/drivers/media/video/marvell-ccic/mmp-driver.c |
| +++ b/drivers/media/video/marvell-ccic/mmp-driver.c |
| @@ -176,7 +176,6 @@ static int mmpcam_probe(struct platform_ |
| 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; |
