[PATCH 1/2] marvell-cam: Build fix: mcam->platform assignment

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It seems that this driver has never been buildable upstream, because it
was merged with this line included:

       mcam->platform = MHP_Armada610;

which causes:

drivers/media/video/marvell-ccic/mmp-driver.c:184:6: error: 'struct mcam_camera' has no member named 'platform'
drivers/media/video/marvell-ccic/mmp-driver.c:184:19: error: 'MHP_Armada610' undeclared (first use in this function)

Since neither the ->platform member nor MHP_Armada610 are defined,
this patch removes the entire line.

Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: stable <stable@xxxxxxxxxxxxxxx>
---
Jon, not sure what the intention was here -- any ideas?  Thanks.

 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 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;
-- 
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


[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux