diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2008-08-07 13:04:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 17:32:56 -0700 |
| commit | 9ff78433f0aeb1f731a22a90206b685df4eaf52e (patch) | |
| tree | 22c8e58ee62b5f71550bd685e7049c7cd7597b9b | |
| parent | d28525f8866244a77b677c0470d4859cb2b6c2a8 (diff) | |
| download | blackbird-op-linux-9ff78433f0aeb1f731a22a90206b685df4eaf52e.tar.gz blackbird-op-linux-9ff78433f0aeb1f731a22a90206b685df4eaf52e.zip | |
USB: fix compiler warning fix
This patch (as1123b) fixes a compiler warning: do_unbind_rebind() is
defined but not used if CONFIG_PM=n.
Problem originally found and initial patch submitted by Alexander
Beregalov <a.beregalov@gmail.com>.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/core/driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 6618bc89eb69..2be37fe466f2 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -774,8 +774,6 @@ void usb_deregister(struct usb_driver *driver) } EXPORT_SYMBOL_GPL(usb_deregister); -#ifdef CONFIG_PM - /* Forced unbinding of a USB interface driver, either because * it doesn't support pre_reset/post_reset/reset_resume or * because it doesn't support suspend/resume. @@ -822,6 +820,8 @@ void usb_rebind_intf(struct usb_interface *intf) dev_warn(&intf->dev, "rebind failed: %d\n", rc); } +#ifdef CONFIG_PM + #define DO_UNBIND 0 #define DO_REBIND 1 |
