From 1285524bd9b91b77a6344d1e9ef5540db8d29fc7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 10 Jul 2008 02:16:44 +0200
Subject: [PATCH] --- yaml --- r: 102289 b: refs/heads/master c:
 c300bd2fb583afb6d68804afd38bc90b31310d95 h: refs/heads/master i:   102287:
 942afaefd14a629178b955ddb5ffbf7a6f7e260a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/pci.c         | 1 +
 trunk/include/linux/pm_wakeup.h | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1dd4e18e0a79..9035e0dcf83a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c157dfa3e4aea5775389f2f4d53c040bc8813af1
+refs/heads/master: c300bd2fb583afb6d68804afd38bc90b31310d95
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index ace518116cc5..44a46c92b721 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/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/trunk/include/linux/pm_wakeup.h b/trunk/include/linux/pm_wakeup.h
index 3af0c8d05cdc..0aae7776185e 100644
--- a/trunk/include/linux/pm_wakeup.h
+++ b/trunk/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;