diff options
author | Andrew Morton <akpm@osdl.org> | 2005-10-23 23:02:20 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 16:47:52 -0700 |
commit | 9a7834d06d553d02cc6e659e94772f69a8b5367f (patch) | |
tree | 9ca891740becd9a090565bc3d73f8da2c2ea54d3 /drivers | |
parent | db2d55b7f7f11823b8d2e5f0c706c7a264320d1b (diff) | |
download | linux-3.10-9a7834d06d553d02cc6e659e94772f69a8b5367f.tar.gz linux-3.10-9a7834d06d553d02cc6e659e94772f69a8b5367f.tar.bz2 linux-3.10-9a7834d06d553d02cc6e659e94772f69a8b5367f.zip |
[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 'drivers')
-rw-r--r-- | drivers/base/power/power.h | 13 | ||||
-rw-r--r-- | drivers/usb/core/hub.c | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 2e700d795cf..fb3d35a9e10 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h @@ -67,9 +67,6 @@ extern int suspend_device(struct device *, pm_message_t); * runtime.c */ -extern int dpm_runtime_suspend(struct device *, pm_message_t); -extern void dpm_runtime_resume(struct device *); - #else /* CONFIG_PM */ @@ -82,14 +79,4 @@ static inline void device_pm_remove(struct device * dev) } -static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state) -{ - return 0; -} - -static inline void dpm_runtime_resume(struct device * dev) -{ - -} - #endif diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 1bacb374b00..9660a8909b7 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2652,8 +2652,6 @@ static void hub_events(void) * stub "device" node was never suspended. */ if (i) { - extern void dpm_runtime_resume(struct device *); - dpm_runtime_resume(&hdev->dev); dpm_runtime_resume(&intf->dev); } |