From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Samuel Ortiz <sameo@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail•com>,
Paul Fertser <fercerpav@gmail•com>,
Anton Vorontsov <avorontsov@ru•mvista.com>
Subject: linux-next: mfd tree build failure
Date: Mon, 23 Nov 2009 14:35:03 +1100 [thread overview]
Message-ID: <20091123143503.3cdf8dee.sfr@canb.auug.org.au> (raw)
Hi Samuel,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/power/pcf50633-charger.c: In function 'pcf50633_mbc_get_usb_online_status':
drivers/power/pcf50633-charger.c:147: error: 'struct pcf50633' has no member named 'mbc_pdev'
Caused by commit 4c2e3bacc050f0ebf884954bb007616c162564cd ("mfd: pcf50633
- fix error handling during probe") from the mfd tree interacting with
commit c329795052aa339850a45fab649ab97a36905136 ("pcf50633: Query charger
status directly") from the battery tree.
I have applied the following merge fixup patch and can carry it as
necessary.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 23 Nov 2009 14:31:43 +1100
Subject: [PATCH] mfd: fix pcf50633-charger.c for fallout from merge
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/power/pcf50633-charger.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index d4a3e77..4e535bb 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -144,7 +144,8 @@ EXPORT_SYMBOL_GPL(pcf50633_mbc_get_status);
int pcf50633_mbc_get_usb_online_status(struct pcf50633 *pcf)
{
- struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev);
+ struct pcf50633_mbc *mbc =
+ platform_get_drvdata(pcf->pdevs[PCF50633_PDEV_ADC_IDX]);
if (!mbc)
return 0;
--
1.6.5.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2009-11-23 3:35 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-23 3:35 Stephen Rothwell [this message]
2009-11-23 12:26 ` linux-next: mfd tree build failure Samuel Ortiz
2009-11-23 16:32 ` Dmitry Torokhov
2009-11-24 23:35 ` Samuel Ortiz
-- strict thread matches above, loose matches on Subject: below --
2010-01-19 4:06 Stephen Rothwell
2010-01-19 10:59 ` Samuel Ortiz
2010-01-19 11:34 ` Stephen Rothwell
2010-01-11 5:02 Stephen Rothwell
2010-01-11 10:51 ` Mark Brown
2010-01-11 12:02 ` Haojian Zhuang
2010-01-11 12:33 ` Samuel Ortiz
2010-01-11 22:44 ` Stephen Rothwell
2009-11-24 5:37 Stephen Rothwell
2009-11-24 9:57 ` Mark Brown
2009-11-24 10:14 ` Stephen Rothwell
2009-11-24 10:40 ` Mark Brown
2009-11-23 3:41 Stephen Rothwell
2009-11-23 4:03 ` Stephen Rothwell
2009-11-23 12:29 ` Samuel Ortiz
2009-11-23 13:11 ` Mark Brown
2009-11-23 14:44 ` Samuel Ortiz
2009-11-23 15:20 ` Mark Brown
2009-10-06 2:02 Stephen Rothwell
2009-10-06 2:35 ` Haojian Zhuang
2009-10-06 3:54 ` Stephen Rothwell
2009-10-06 4:19 ` Haojian Zhuang
2009-10-08 5:59 ` Haojian Zhuang
2009-10-12 2:11 ` Stephen Rothwell
2009-01-12 3:03 Stephen Rothwell
2009-01-12 10:07 ` Balaji Rao
2009-01-13 6:24 ` Stephen Rothwell
2009-01-14 12:12 ` Samuel Ortiz
2008-08-05 14:08 Stephen Rothwell
2008-08-05 15:39 ` ian
2008-08-05 16:05 ` Adrian Bunk
2008-08-05 18:50 ` ian
2008-08-05 16:05 ` Stephen Rothwell
2008-08-05 16:08 ` Samuel Ortiz
2008-08-05 16:16 ` Stephen Rothwell
2008-08-05 17:40 ` Samuel Ortiz
2008-08-05 18:46 ` ian
2008-08-06 9:53 ` Samuel Ortiz
2008-08-06 0:40 ` Stephen Rothwell
2008-08-05 5:09 Stephen Rothwell
2008-08-05 13:03 ` ian
2008-08-05 13:09 ` Samuel Ortiz
2008-08-05 13:22 ` Stephen Rothwell
2008-08-05 15:29 ` ian
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=20091123143503.3cdf8dee.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avorontsov@ru$(echo .)mvista.com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=fercerpav@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sameo@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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