diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 01:54:33 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 01:54:33 (GMT) |
| commit | 829455bb0e994373519e3c58d403fc1148f44630 (patch) | |
| tree | 7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a /drivers/staging/dwc2/hcd_intr.c | |
| parent | 42b4212baa28ebb07147c1de3990c596e7612e97 (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
| download | linux-fsl-qoriq-829455bb0e994373519e3c58d403fc1148f44630.tar.xz | |
Merge 3.10-rc3 into staging-next
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dwc2/hcd_intr.c')
| -rw-r--r-- | drivers/staging/dwc2/hcd_intr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/dwc2/hcd_intr.c b/drivers/staging/dwc2/hcd_intr.c index e84f244..e75dccb 100644 --- a/drivers/staging/dwc2/hcd_intr.c +++ b/drivers/staging/dwc2/hcd_intr.c @@ -56,8 +56,6 @@ static void dwc2_track_missed_sofs(struct dwc2_hsotg *hsotg) { #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS -#warning Compiling code to track missed SOFs - u16 curr_frame_number = hsotg->frame_number; if (hsotg->frame_num_idx < FRAME_NUM_ARRAY_SIZE) { |