Skip to contentSkip to conversation

marvell-cam: fix an ARM build error

PATCH In review Jonathan Corbet 2 participants 2 messages Apr 20, 2012 – Apr 26, 2012 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

drivers/media/video/marvell-ccic/mmp-driver.c +0 -1
index d235523..c4c17fe 100644
@@ -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 on v1 1/1
#1 lore raw

Hi,

Quoted 13 lines · Jonathan Corbet

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.

drivers/media/video/marvell-ccic/mmp-driver.c +0 -0
index d235523..c4c17fe 100644

drivers/media/video/marvell-ccic/mmp-driver.c static int mmpcam_probe(struct platform_device *pdev) · line 186

Quoted 7 lines
drivers/media/video/marvell-ccic/mmp-driver.c +0 -1
@@ -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;

Thanks!

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child