diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2012-04-20 12:22:50 -0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-20 22:56:40 +0100 |
| commit | 6f00c2014c321fcb7574583b4df796ca40e5ddcf (patch) | |
| tree | 2de5d59ec3edf94ba2b0c5d5f3d243f71bd721f7 /drivers/media/video/marvell-ccic | |
| parent | 0e62760a18f44b03e081d260501640ae08474973 (diff) | |
| download | kernel_samsung_smdk4412-6f00c2014c321fcb7574583b4df796ca40e5ddcf.zip kernel_samsung_smdk4412-6f00c2014c321fcb7574583b4df796ca40e5ddcf.tar.gz kernel_samsung_smdk4412-6f00c2014c321fcb7574583b4df796ca40e5ddcf.tar.bz2 | |
marvell-cam: fix an ARM build error
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/media/video/marvell-ccic')
| -rw-r--r-- | drivers/media/video/marvell-ccic/mmp-driver.c | 1 |
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 fb0b124..a6b7657 100644 --- a/drivers/media/video/marvell-ccic/mmp-driver.c +++ b/drivers/media/video/marvell-ccic/mmp-driver.c @@ -175,7 +175,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; |