diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-01 11:28:51 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-01 11:47:26 +0800 |
| commit | d5800fcb9c0a07366c920414326ecb61d362b7b1 (patch) | |
| tree | 686d7f7c5291fae49b48dbc95355e06d0c42d945 /drivers/usb/chipidea/otg.h | |
| parent | ffa6a894db981abaed4e023cb2b198cc22e68f0f (diff) | |
| parent | 58ad81506e01e6a9625bc096595113f1f6bbe521 (diff) | |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into imx_3.10.y_android
Conflicts:
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
drivers/hwmon/Makefile
drivers/hwmon/mma8x5x.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
drivers/usb/chipidea/otg_fsm.c
drivers/usb/chipidea/udc.c
drivers/usb/gadget/udc-core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
Diffstat (limited to 'drivers/usb/chipidea/otg.h')
| -rw-r--r-- | drivers/usb/chipidea/otg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h index 05ad33707b72..c42ac78d3035 100644 --- a/drivers/usb/chipidea/otg.h +++ b/drivers/usb/chipidea/otg.h @@ -17,6 +17,7 @@ int ci_hdrc_otg_init(struct ci_hdrc *ci); void ci_hdrc_otg_destroy(struct ci_hdrc *ci); enum ci_role ci_otg_role(struct ci_hdrc *ci); void ci_handle_vbus_change(struct ci_hdrc *ci); +void ci_handle_id_switch(struct ci_hdrc *ci); void ci_handle_vbus_connected(struct ci_hdrc *ci); static inline void ci_otg_queue_work(struct ci_hdrc *ci) { |