From 4b16694bcea43445ed9cc4879464354a0a34636f Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Sat, 18 Feb 2012 00:06:38 +0400 Subject: Fix merge error in drivers/usb/host/ehci.h Signed-off-by: Andrey Konovalov --- drivers/usb/host/ehci.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 945eacac58e3..01cefde1d49c 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 -- cgit v1.2.3