diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/octeon-usb/octeon-hcd.h | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/octeon-usb/octeon-hcd.h')
| -rw-r--r-- | kernel/drivers/staging/octeon-usb/octeon-hcd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/drivers/staging/octeon-usb/octeon-hcd.h b/kernel/drivers/staging/octeon-usb/octeon-hcd.h index 3e351ab74..70e7fa5e3 100644 --- a/kernel/drivers/staging/octeon-usb/octeon-hcd.h +++ b/kernel/drivers/staging/octeon-usb/octeon-hcd.h @@ -1693,7 +1693,7 @@ union cvmx_usbnx_usbp_ctl_status { * struct cvmx_usbnx_usbp_ctl_status_s * @txrisetune: HS Transmitter Rise/Fall Time Adjustment * @txvreftune: HS DC Voltage Level Adjustment - * @txfslstune: FS/LS Source Impedence Adjustment + * @txfslstune: FS/LS Source Impedance Adjustment * @txhsxvtune: Transmitter High-Speed Crossover Adjustment * @sqrxtune: Squelch Threshold Adjustment * @compdistune: Disconnect Threshold Adjustment |