From: Chris Ball <cjb@laptop.org>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-media@vger.kernel.org
Subject: [PATCH 1/2] marvell-cam: Build fix: mcam->platform assignment
Date: Thu, 26 Apr 2012 16:07:25 -0400 [thread overview]
Message-ID: <87ehra9s02.fsf@laptop.org> (raw)
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@laptop.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: stable <stable@vger.kernel.org>
---
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@laptop.org> <http://printf.net/>
One Laptop Per Child
next reply other threads:[~2012-04-26 20:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 20:07 Chris Ball [this message]
2012-04-26 20:08 ` [PATCH 1/2] marvell-cam: Build fix: mcam->platform assignment Jonathan Corbet
2012-04-26 20:14 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ehra9s02.fsf@laptop.org \
--to=cjb@laptop.org \
--cc=corbet@lwn.net \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).