diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:34:32 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:34:32 -0700 |
| commit | 157097089f21d1c99b03b1d09fac82ccc4b1a636 (patch) | |
| tree | 8dae9354c66392d655f7d0349a922f643535948e | |
| parent | 67204e11aedd25df0eb238f02f1cfc65ed197328 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-fport
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
| -rw-r--r-- | drivers/usb/host/ehci-q.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/ehci.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index 271987952e3..efd5b3131ea 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -998,7 +998,7 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh) /* * flush qh descriptor into memory immediately, * see comments in qh_append_tds. - * */ + */ ehci_sync_mem(); qh_get(qh); @@ -1097,7 +1097,11 @@ 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); diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 313d9d6c1ef..742a084ef97 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -743,7 +743,7 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x) * writing buffer, so introduce the helper which can flush L2 writing * buffer into memory immediately, especially used to flush ehci * descriptor to memory. - * */ + */ #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE static inline void ehci_sync_mem() { |