diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:19 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:19 +0200 |
| commit | 609cbf05e36abcc92b1e60749b8dd0dc420144fa (patch) | |
| tree | c4e0f2cd1eeaefbdd381b51fdd1eb13b50a0da59 /drivers/usb/core/usb.h | |
| parent | 5d7e606a3696b992df40afaf9b04872320346c41 (diff) | |
| parent | f3dde6c805e1094c1b0f0fb253ac02c43049fb84 (diff) | |
Merge topic branch 'usb' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/usb/core/usb.h')
| -rw-r--r-- | drivers/usb/core/usb.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 45e8479c377..8966c64b7c4 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -1,5 +1,9 @@ #include <linux/pm.h> +#ifdef CONFIG_ARCH_U8500 +extern int usb_device_count; +#endif + /* Functions local to drivers/usb/core/ */ extern int usb_create_sysfs_dev_files(struct usb_device *dev); @@ -73,7 +77,9 @@ static inline int usb_port_resume(struct usb_device *udev, pm_message_t msg) } #endif - +#ifdef CONFIG_USB_OTG +extern void usb_hnp_polling_work(struct work_struct *work); +#endif #ifdef CONFIG_USB_SUSPEND extern void usb_autosuspend_device(struct usb_device *udev); |