diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /include/linux/platform_data/usb-omap.h | |
| parent | d7dde8c191d136415819e4456e21f2b0cc00c326 (diff) | |
| parent | d9ba573718666df2e7e30d671f81bba39d07f91c (diff) | |
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Diffstat (limited to 'include/linux/platform_data/usb-omap.h')
| -rw-r--r-- | include/linux/platform_data/usb-omap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h index 8570bcfe6311..ef65b67c56c3 100644 --- a/include/linux/platform_data/usb-omap.h +++ b/include/linux/platform_data/usb-omap.h | |||
| @@ -59,6 +59,9 @@ struct usbhs_omap_platform_data { | |||
| 59 | 59 | ||
| 60 | struct ehci_hcd_omap_platform_data *ehci_data; | 60 | struct ehci_hcd_omap_platform_data *ehci_data; |
| 61 | struct ohci_hcd_omap_platform_data *ohci_data; | 61 | struct ohci_hcd_omap_platform_data *ohci_data; |
| 62 | |||
| 63 | /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */ | ||
| 64 | unsigned single_ulpi_bypass:1; | ||
| 62 | }; | 65 | }; |
| 63 | 66 | ||
| 64 | /*-------------------------------------------------------------------------*/ | 67 | /*-------------------------------------------------------------------------*/ |