Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756636AbYGJAPW (ORCPT ); Wed, 9 Jul 2008 20:15:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752535AbYGJAPJ (ORCPT ); Wed, 9 Jul 2008 20:15:09 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49128 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752194AbYGJAPH (ORCPT ); Wed, 9 Jul 2008 20:15:07 -0400 From: "Rafael J. Wysocki" To: Jesse Barnes Subject: Re: next-0708: build failure at drivers/pci/pci-acpi.c Date: Thu, 10 Jul 2008 02:16:44 +0200 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: "Alexander Beregalov" , ak@linux.intel.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-next@vger.kernel.org, "Linux Kernel Mailing List" , "pm list" , David Howells , Stephen Rothwell References: <200807082229.33016.rjw@sisk.pl> <200807091621.37697.jbarnes@virtuousgeek.org> In-Reply-To: <200807091621.37697.jbarnes@virtuousgeek.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200807100216.45690.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1942 Lines: 61 On Thursday, 10 of July 2008, Jesse Barnes wrote: > On Tuesday, July 8, 2008 1:29:31 pm Rafael J. Wysocki wrote: > > On Tuesday, 8 of July 2008, Jesse Barnes wrote: > > > David sent me one just like this at 7am this morning, just applied and > > > pushed (along with Alexander's tested-by). > > > > OK, thanks. > > > > Would you like me to send the Stephen's fix for compilation on ppc64 > > (CONFIG_PM unset)? > > Sure, unless it's already in the ppc tree... It looks like Stephen had to apply it today too, so I guess it isn't. Thanks, Rafael --- From: Stephen Rothwell Subject: [PATCH] pci: include linux/pm_wakeup.h for device_set_wakeup_capable Signed-off-by: Stephen Rothwell Signed-off-by: Rafael J. Wysocki --- drivers/pci/pci.c | 1 + include/linux/pm_wakeup.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e632a58..3d92b71 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -17,6 +17,7 @@ #include #include #include +#include #include /* isa_dma_bridge_buggy */ #include "pci.h" diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 3af0c8d..0aae777 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -63,6 +63,8 @@ static inline void device_init_wakeup(struct device *dev, int val) dev->power.can_wakeup = !!val; } +static inline void device_set_wakeup_capable(struct device *dev, int val) { } + static inline int device_can_wakeup(struct device *dev) { return dev->power.can_wakeup; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/