diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/usb/dwc2/core.h | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/usb/dwc2/core.h')
| -rw-r--r-- | drivers/usb/dwc2/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index bf015ab3b44c..55c90c53f2d6 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h | |||
| @@ -619,7 +619,7 @@ struct dwc2_hsotg { | |||
| 619 | unsigned port_suspend_change:1; | 619 | unsigned port_suspend_change:1; |
| 620 | unsigned port_over_current_change:1; | 620 | unsigned port_over_current_change:1; |
| 621 | unsigned port_l1_change:1; | 621 | unsigned port_l1_change:1; |
| 622 | unsigned reserved:26; | 622 | unsigned reserved:25; |
| 623 | } b; | 623 | } b; |
| 624 | } flags; | 624 | } flags; |
| 625 | 625 | ||