diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /include/linux/usb/msm_hsusb.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/usb/msm_hsusb.h')
| -rw-r--r-- | include/linux/usb/msm_hsusb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 00311fe9d0df..22a396c13f3a 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h | |||
| @@ -160,7 +160,7 @@ struct msm_otg_platform_data { | |||
| 160 | * detection process. | 160 | * detection process. |
| 161 | */ | 161 | */ |
| 162 | struct msm_otg { | 162 | struct msm_otg { |
| 163 | struct otg_transceiver otg; | 163 | struct usb_phy phy; |
| 164 | struct msm_otg_platform_data *pdata; | 164 | struct msm_otg_platform_data *pdata; |
| 165 | int irq; | 165 | int irq; |
| 166 | struct clk *clk; | 166 | struct clk *clk; |