aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-10-24 02:02:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:47:52 -0400
commit9a7834d06d553d02cc6e659e94772f69a8b5367f (patch)
tree9ca891740becd9a090565bc3d73f8da2c2ea54d3 /include/linux
parentdb2d55b7f7f11823b8d2e5f0c706c7a264320d1b (diff)
[PATCH] USB: fix pm patches with CONFIG_PM off part 2
With CONFIG_PM=n: drivers/built-in.o(.text+0x1098c): In function `hub_thread': drivers/usb/core/hub.c:2673: undefined reference to `.dpm_runtime_resume' drivers/built-in.o(.text+0x10998):drivers/usb/core/hub.c:2674: undefined reference to `.dpm_runtime_resume' Please, never ever ever put extern decls into .c files. Use the darn header files :( Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pm.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 83bae1cbe55b..c61d5de837ef 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -243,6 +243,9 @@ extern int device_suspend(pm_message_t state);
243#define device_may_wakeup(dev) \ 243#define device_may_wakeup(dev) \
244 (device_can_wakeup(dev) && (dev)->power.should_wakeup) 244 (device_can_wakeup(dev) && (dev)->power.should_wakeup)
245 245
246extern int dpm_runtime_suspend(struct device *, pm_message_t);
247extern void dpm_runtime_resume(struct device *);
248
246#else /* !CONFIG_PM */ 249#else /* !CONFIG_PM */
247 250
248static inline int device_suspend(pm_message_t state) 251static inline int device_suspend(pm_message_t state)
@@ -253,6 +256,16 @@ static inline int device_suspend(pm_message_t state)
253#define device_set_wakeup_enable(dev,val) do{}while(0) 256#define device_set_wakeup_enable(dev,val) do{}while(0)
254#define device_may_wakeup(dev) (0) 257#define device_may_wakeup(dev) (0)
255 258
259static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
260{
261 return 0;
262}
263
264static inline void dpm_runtime_resume(struct device * dev)
265{
266
267}
268
256#endif 269#endif
257 270
258/* changes to device_may_wakeup take effect on the next pm state change. 271/* changes to device_may_wakeup take effect on the next pm state change.