Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / usb / host / ohci.h

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index bad11a72c2022acdd7294ed7f84081849d5ee01e..35e5fd640ce75388c7f373544c62e965f34c0111 100644 (file)
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -575,18 +575,8 @@ static inline void _ohci_writel (const struct ohci_hcd *ohci,
 #endif
 }
 
-#ifdef CONFIG_ARCH_LH7A404
-/* Marc Singer: at the time this code was written, the LH7A404
- * had a problem reading the USB host registers.  This
- * implementation of the ohci_readl function performs the read
- * twice as a work-around.
- */
-#define ohci_readl(o,r)                (_ohci_readl(o,r),_ohci_readl(o,r))
-#define ohci_writel(o,v,r)     _ohci_writel(o,v,r)
-#else
 #define ohci_readl(o,r)                _ohci_readl(o,r)
 #define ohci_writel(o,v,r)     _ohci_writel(o,v,r)
-#endif
 
 
 /*-------------------------------------------------------------------------*/