Hi, On Fri, Apr 20 2012, Jonathan Corbet wrote: > 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@xxxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Jonathan Corbet <corbet@xxxxxxx> > > diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c > index d235523..c4c17fe 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; Tested-by: Chris Ball <cjb@xxxxxxxxxx> Thanks! - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html