]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 10 Jul 2008 00:16:44 +0000 (02:16 +0200)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 14 Jul 2008 21:30:21 +0000 (14:30 -0700)
drivers/pci/pci.c needs pm_wakeup.h since it uses device_set_wakup_capable().
The latter also needs to be stubbed out for !CONFIG_PM.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/pci.c
include/linux/pm_wakeup.h

index ace518116cc5db887b7c35bc4478cd83c904507f..44a46c92b721a2c6d97fe1b795b6e4c0b1656ad6 100644 (file)
@@ -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"
 
index 3af0c8d05cdcb2e89cd70cc5de16fb264a771bd0..0aae7776185e63523a3eac6535adfbd8f9524e28 100644 (file)
@@ -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;