[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200807100216.45690.rjw@sisk.pl>
Date: Thu, 10 Jul 2008 02:16:44 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: "Alexander Beregalov" <a.beregalov@...il.com>, ak@...ux.intel.com,
lenb@...nel.org, linux-acpi@...r.kernel.org,
linux-next@...r.kernel.org,
"Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
"pm list" <linux-pm@...ts.linux-foundation.org>,
David Howells <dhowells@...hat.com>,
Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: next-0708: build failure at drivers/pci/pci-acpi.c
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 <sfr@...b.auug.org.au>
Subject: [PATCH] pci: include linux/pm_wakeup.h for device_set_wakeup_capable
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
---
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 <linux/string.h>
#include <linux/log2.h>
#include <linux/pci-aspm.h>
+#include <linux/pm_wakeup.h>
#include <asm/dma.h> /* 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists