summaryrefslogtreecommitdiff
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-25 14:39:12 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-25 14:39:12 +0200
commitf58899bb0224741eb0409ada67ecafe90ba137ef (patch)
tree78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/usb/core/usb.h
parenta2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff)
parent83097aca8567a0bd593534853b71fe0fa9a75d69 (diff)
downloadlwn-f58899bb0224741eb0409ada67ecafe90ba137ef.tar.gz
lwn-f58899bb0224741eb0409ada67ecafe90ba137ef.zip
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d9a6e16dbf84..9a1a45ac3add 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -41,6 +41,9 @@ extern void usb_host_cleanup(void);
#ifdef CONFIG_PM
+extern int usb_suspend(struct device *dev, pm_message_t msg);
+extern int usb_resume(struct device *dev);
+
extern void usb_autosuspend_work(struct work_struct *work);
extern int usb_port_suspend(struct usb_device *dev);
extern int usb_port_resume(struct usb_device *dev);