summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2012-04-20 17:22:50 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-26 20:30:54 +0200
commit9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77 (patch)
tree3d2c1a089c388d8444b200f03b61dea2e23e0ee5 /drivers/media/video
parent[media] V4L: soc-camera: protect hosts during probing from overzealous user-s... (diff)
downloadlinux-9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77.tar.xz
linux-9967232f1be5bab10c7b7a8dcf51ff5c3c1a6d77.zip
[media] marvell-cam: fix an ARM build error
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/marvell-ccic/mmp-driver.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c
index d23552323f45..c4c17fe76c0d 100644
--- a/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/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;