diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-18 00:06:38 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-18 00:08:20 +0400 |
| commit | 4b16694bcea43445ed9cc4879464354a0a34636f (patch) | |
| tree | 08ef3fddb99711a5df3ddd748859a09e964e3f6f | |
| parent | 8393ea14076dbda27010fcabcff5e2d40f0bfb1f (diff) | |
Fix merge error in drivers/usb/host/ehci.hlinux-linaro-3.3-rc3-2012.02-1-android-0
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | drivers/usb/host/ehci.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 945eacac58e..01cefde1d49 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -779,23 +779,6 @@ static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci) #endif -/* - * Writing to dma coherent memory on ARM may be delayed via L2 - * 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() -{ - mb(); -} -#else -static inline void ehci_sync_mem() -{ -} -#endif - /*-------------------------------------------------------------------------*/ #ifndef DEBUG |