diff options
| author | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
|---|---|---|
| committer | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
| commit | f962cbcefdfad22ffff41e19ad4c5ff58815c05c (patch) | |
| tree | e9424582f1fdc92d360ff58c831ddf801a268e3f /arch/arm/plat-mxc/usb_common.c | |
| parent | 15f55e0b22f8953b56fb5d6bdf8b770228f2f449 (diff) | |
| parent | 16af5ee7d9556c47b332788e4107cbed5ee7ec10 (diff) | |
Merge remote-tracking branch 'github/3.0-pcm052' into 3.0-pcm0523.0-pcm052-ts2
Release 3.0-ts2: enable USB support for the phyCORE Vybrid
Diffstat (limited to 'arch/arm/plat-mxc/usb_common.c')
| -rwxr-xr-x | arch/arm/plat-mxc/usb_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c index 0aa3d590d1d2..96cede81d319 100755 --- a/arch/arm/plat-mxc/usb_common.c +++ b/arch/arm/plat-mxc/usb_common.c @@ -1049,6 +1049,9 @@ EXPORT_SYMBOL(usb_debounce_id_vbus); int usb_event_is_otg_wakeup(struct fsl_usb2_platform_data *pdata) { +#ifdef CONFIG_ARCH_MVF + return false; +#endif return (USBCTRL & UCTRL_OWIR) ? true : false; } EXPORT_SYMBOL(usb_event_is_otg_wakeup); |