diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:39:40 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:39:40 -0700 |
| commit | 0927679c26e461abdce8704bfb5dea7646570109 (patch) | |
| tree | 8ac861e412ef125bbe0da52748b70ed7f0d3375d | |
| parent | 157097089f21d1c99b03b1d09fac82ccc4b1a636 (diff) | |
Commit uncommitted collision fix from last mergelinux-linaro-3.1-2011.10-0-android-0
Missed one silly collision line in the last merge.
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/usb/host/ehci-q.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index efd5b3131ea..b7f9496e4f0 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -1097,11 +1097,7 @@ static struct ehci_qh *qh_append_tds ( * is added to flush 'token' immediatelly into * memory, so that ehci can execute the transaction * ASAP. -<<<<<<< HEAD - * */ -======= */ ->>>>>>> upstream/linaro-3.1 ehci_sync_mem(); urb->hcpriv = qh_get (qh); |