diff options
| author | Alan Stern | 2006-11-13 21:02:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2006-12-01 23:23:35 +0100 |
| commit | db063507b40664de33a61161c90358fe6fc9565a (patch) | |
| tree | 7860c2a7469be06ef98390b12da295c102760c38 /drivers/usb/core | |
| parent | USB: fix aircable.c: inconsequent NULL checking (diff) | |
| download | kernel-qcow2-linux-db063507b40664de33a61161c90358fe6fc9565a.tar.gz kernel-qcow2-linux-db063507b40664de33a61161c90358fe6fc9565a.tar.xz kernel-qcow2-linux-db063507b40664de33a61161c90358fe6fc9565a.zip | |
USB core: fix compiler warning about usb_autosuspend_work
This patch (as821) fixes a compiler warning when CONFIG_PM isn't on
("usb_autosuspend_work" defined but not used).
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/usb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index a83c2d5065c1..81cb52564e68 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -200,13 +200,6 @@ static void ksuspend_usb_cleanup(void) destroy_workqueue(ksuspend_usb_wq); } -#else - -#define ksuspend_usb_init() 0 -#define ksuspend_usb_cleanup() do {} while (0) - -#endif - #ifdef CONFIG_USB_SUSPEND /* usb_autosuspend_work - callback routine to autosuspend a USB device */ @@ -225,7 +218,14 @@ static void usb_autosuspend_work(void *_udev) static void usb_autosuspend_work(void *_udev) {} -#endif +#endif /* CONFIG_USB_SUSPEND */ + +#else + +#define ksuspend_usb_init() 0 +#define ksuspend_usb_cleanup() do {} while (0) + +#endif /* CONFIG_PM */ /** * usb_alloc_dev - usb device constructor (usbcore-internal) |