---

yaml --- r: 102289 b: refs/heads/master c: c300bd2 h: refs/heads/master i: 102287: 942afae v: v3
git-mirror · Jul 14, 2008 · 1285524 · 1285524
1 parent f1dc4b7
commit 1285524
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;