From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752853Ab1BNWmX (ORCPT ); Mon, 14 Feb 2011 17:42:23 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:44522 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472Ab1BNWmV (ORCPT ); Mon, 14 Feb 2011 17:42:21 -0500 From: "Rafael J. Wysocki" To: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the drivers-x86 tree Date: Mon, 14 Feb 2011 23:42:12 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc4+; KDE/4.4.4; x86_64; ; ) Cc: Matthew Garrett , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown , Paul Fox References: <20110214163944.53c1241d.sfr@canb.auug.org.au> In-Reply-To: <20110214163944.53c1241d.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102142342.12767.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Date: Mon, 14 Feb 2011 16:36:41 +1100 > Subject: [PATCH] OLPC: fix for removal of run_wak_count > > Signed-off-by: Stephen Rothwell > --- > 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); > }