diff options
| author | Benn Pörscke <benn.porscke@stericsson.com> | 2011-10-07 15:31:57 +0200 |
|---|---|---|
| committer | Benn Pörscke <benn.porscke@stericsson.com> | 2011-10-07 15:31:57 +0200 |
| commit | 47a4dbf83a75014d6b3467be18997894f1c617db (patch) | |
| tree | 7f5d116db48205309fbc4ae0954f20ab8a651e46 /drivers/usb/core/usb.h | |
| parent | ea8a52f9f4bcc3420c38ae07f8378a2f18443970 (diff) | |
Squashandroid-20111012
Change-Id: If0ae9fa8067740ab2ede33703c79ec134f204a5e
Diffstat (limited to 'drivers/usb/core/usb.h')
| -rw-r--r-- | drivers/usb/core/usb.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index cd882203ad3..4e9bc71440e 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -1,5 +1,8 @@ #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); @@ -72,6 +75,17 @@ static inline int usb_port_resume(struct usb_device *udev, pm_message_t msg) #endif +#ifdef CONFIG_USB_OTG +#ifdef CONFIG_USB_OTG_20 +extern void usb_hnp_polling_work(struct work_struct *work); +#else +static inline void usb_hnp_polling_work(struct work_struct *work) +{ +} +#endif +#endif + + #ifdef CONFIG_USB_SUSPEND extern void usb_autosuspend_device(struct usb_device *udev); |