diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-09 20:16:44 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-14 17:30:21 -0400 |
| commit | c300bd2fb583afb6d68804afd38bc90b31310d95 (patch) | |
| tree | b515c200eaaedb2525a70aa26f71469e084f1549 | |
| parent | c157dfa3e4aea5775389f2f4d53c040bc8813af1 (diff) | |
PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
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>
| -rw-r--r-- | drivers/pci/pci.c | 1 | ||||
| -rw-r--r-- | 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 ace518116cc5..44a46c92b721 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/log2.h> | 18 | #include <linux/log2.h> |
| 19 | #include <linux/pci-aspm.h> | 19 | #include <linux/pci-aspm.h> |
| 20 | #include <linux/pm_wakeup.h> | ||
| 20 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ | 21 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ |
| 21 | #include "pci.h" | 22 | #include "pci.h" |
| 22 | 23 | ||
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 3af0c8d05cdc..0aae7776185e 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) | |||
| 63 | dev->power.can_wakeup = !!val; | 63 | dev->power.can_wakeup = !!val; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | static inline void device_set_wakeup_capable(struct device *dev, int val) { } | ||
| 67 | |||
| 66 | static inline int device_can_wakeup(struct device *dev) | 68 | static inline int device_can_wakeup(struct device *dev) |
| 67 | { | 69 | { |
| 68 | return dev->power.can_wakeup; | 70 | return dev->power.can_wakeup; |
