From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Matthew Garrett <mjg59@srcf•ucam.org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Len Brown <lenb@kernel•org>, Paul Fox <pgf@laptop•org>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
Date: Mon, 14 Feb 2011 23:42:12 +0100 [thread overview]
Message-ID: <201102142342.12767.rjw@sisk.pl> (raw)
In-Reply-To: <20110214163944.53c1241d.sfr@canb.auug.org.au>
On Monday, February 14, 2011, Stephen Rothwell wrote:
> Hi Matthew,
>
> After merging the drivers-x86 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/platform/x86/xo15-ebook.c: In function 'ebook_switch_add':
> drivers/platform/x86/xo15-ebook.c:136: error: 'struct acpi_device_wakeup' has no member named 'run_wake_count'
>
> Caused by commit f160ad4c2a720411a136db7b867c3b4b868b8933 ("OLPC XO-1.5
> ebook switch driver") interacting with commit
> 0cab2dcf9963b1a7ed32e730384e1e8925b099cd ("ACPI: Remove the
> wakeup.run_wake_count device field") from the acpi tree.
>
> I have applied this merge fix patch:
The fix is correct, thanks Stephen!
Rafael
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 14 Feb 2011 16:36:41 +1100
> Subject: [PATCH] OLPC: fix for removal of run_wak_count
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/platform/x86/xo15-ebook.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
> index 2343bb3..c1372ed 100644
> --- a/drivers/platform/x86/xo15-ebook.c
> +++ b/drivers/platform/x86/xo15-ebook.c
> @@ -133,7 +133,6 @@ static int ebook_switch_add(struct acpi_device *device)
> /* Button's GPE is run-wake GPE */
> acpi_enable_gpe(device->wakeup.gpe_device,
> device->wakeup.gpe_number);
> - device->wakeup.run_wake_count++;
> device_set_wakeup_enable(&device->dev, true);
> }
next prev parent reply other threads:[~2011-02-14 22:42 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 5:39 linux-next: build failure after merge of the drivers-x86 tree Stephen Rothwell
2011-02-14 22:42 ` Rafael J. Wysocki [this message]
2011-03-25 4:44 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-01-15 3:52 Stephen Rothwell
2026-01-15 3:54 ` Kees Cook
2026-01-15 9:53 ` Ilpo Järvinen
2025-05-15 6:46 Stephen Rothwell
2025-05-15 8:32 ` Ilpo Järvinen
2025-05-15 9:22 ` Ingo Molnar
2025-05-15 12:19 ` Stephen Rothwell
2025-05-15 12:57 ` Ingo Molnar
2025-02-06 2:36 Stephen Rothwell
2025-02-06 10:27 ` Ilpo Järvinen
2025-02-06 14:49 ` Joshua Grisham
2025-02-06 19:22 ` Ilpo Järvinen
2021-08-20 5:00 Stephen Rothwell
2021-08-20 7:31 ` M D
2021-08-20 10:11 ` Hans de Goede
2021-07-28 16:48 Mark Brown
2021-07-28 17:01 ` Andy Shevchenko
2021-07-28 17:27 ` Kammela, Gayatri
2021-07-28 17:55 ` Hans de Goede
2021-07-28 17:59 ` Kammela, Gayatri
2019-10-15 2:00 Stephen Rothwell
2019-10-15 8:04 ` Andy Shevchenko
2019-10-15 11:42 ` Stephen Rothwell
2018-06-12 1:23 Stephen Rothwell
2018-06-12 3:28 ` dvhart
2018-06-12 5:18 ` Darren Hart
2015-06-05 10:13 Michael Ellerman
2015-06-08 4:52 ` Darren Hart
2015-06-04 8:13 Stephen Rothwell
2015-06-04 17:51 ` Radim Krčmář
2015-06-08 4:27 ` Darren Hart
2012-08-20 6:11 Stephen Rothwell
2012-08-20 6:44 ` AceLan Kao
2012-03-22 4:33 Stephen Rothwell
2012-03-21 5:52 Stephen Rothwell
2012-03-21 11:19 ` Matthew Garrett
2011-02-22 5:22 Stephen Rothwell
2011-02-22 6:26 ` Mattia Dongili
2011-02-22 11:46 ` Mattia Dongili
2011-02-22 14:34 ` Matthew Garrett
2011-02-22 22:22 ` Stephen Rothwell
2011-02-08 3:45 Stephen Rothwell
2011-02-08 3:50 ` Matthew Garrett
2010-12-07 2:24 Stephen Rothwell
2010-10-05 4:11 Stephen Rothwell
2010-10-05 10:36 ` Ike Panhc
2010-10-06 10:45 ` Ike Panhc
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=201102142342.12767.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mjg59@srcf$(echo .)ucam.org \
--cc=pgf@laptop$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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