aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2006-11-13 15:02:04 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 17:23:35 -0500
commitdb063507b40664de33a61161c90358fe6fc9565a (patch)
tree7860c2a7469be06ef98390b12da295c102760c38
parent7a5c7b42d3c7b1e0085d48414ee73003d3888d1f (diff)
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>
-rw-r--r--drivers/usb/core/usb.c16
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)
200 destroy_workqueue(ksuspend_usb_wq); 200 destroy_workqueue(ksuspend_usb_wq);
201} 201}
202 202
203#else
204
205#define ksuspend_usb_init() 0
206#define ksuspend_usb_cleanup() do {} while (0)
207
208#endif
209
210#ifdef CONFIG_USB_SUSPEND 203#ifdef CONFIG_USB_SUSPEND
211 204
212/* usb_autosuspend_work - callback routine to autosuspend a USB device */ 205/* usb_autosuspend_work - callback routine to autosuspend a USB device */
@@ -225,7 +218,14 @@ static void usb_autosuspend_work(void *_udev)
225static void usb_autosuspend_work(void *_udev) 218static void usb_autosuspend_work(void *_udev)
226{} 219{}
227 220
228#endif 221#endif /* CONFIG_USB_SUSPEND */
222
223#else
224
225#define ksuspend_usb_init() 0
226#define ksuspend_usb_cleanup() do {} while (0)
227
228#endif /* CONFIG_PM */
229 229
230/** 230/**
231 * usb_alloc_dev - usb device constructor (usbcore-internal) 231 * usb_alloc_dev - usb device constructor (usbcore-internal)