diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 09:13:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 09:13:31 -0700 |
| commit | f7a0d426f3e7ec321b8037238b6426566df36edb (patch) | |
| tree | 505e7d0264500db94534f1226684f78af7757289 /drivers/usb/otg/otg_fsm.h | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| parent | b790f5d1260b4c962bd066cd34ae982943c27fe1 (diff) | |
| download | linux-f7a0d426f3e7ec321b8037238b6426566df36edb.tar.bz2 | |
Merge 3.3-rc7 into usb-next
This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/otg/otg_fsm.h')
| -rw-r--r-- | drivers/usb/otg/otg_fsm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/otg_fsm.h b/drivers/usb/otg/otg_fsm.h index 0cecf1d593a0..c30a2e1d9e46 100644 --- a/drivers/usb/otg/otg_fsm.h +++ b/drivers/usb/otg/otg_fsm.h @@ -82,7 +82,7 @@ struct otg_fsm { int loc_sof; struct otg_fsm_ops *ops; - struct otg_transceiver *transceiver; + struct usb_otg *otg; /* Current usb protocol used: 0:undefine; 1:host; 2:client */ int protocol; |