From d5f6db9e1aff6ccf1876224f152c0268b0c8a992 Mon Sep 17 00:00:00 2001 From: Jan Andersson Date: Thu, 19 May 2011 20:47:02 +0200 Subject: [PATCH] USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h {read,write}l_be are now defined for SPARC and do not need to be defined for SPARC_LEON in ehci.h. This patch fixes the following warnings: CC drivers/usb/host/ehci-hcd.o In file included from drivers/usb/host/ehci-hcd.c:119: drivers/usb/host/ehci.h:631:1: warning: "readl_be" redefined ... drivers/usb/host/ehci-hcd.c:119: drivers/usb/host/ehci.h:632:1: warning: "writel_be" redefined ... Signed-off-by: Jan Andersson Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ehci.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index f68e419cae87..bd6ff489baf9 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -628,9 +628,6 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) #if defined(CONFIG_ARM) && defined(CONFIG_ARCH_IXP4XX) #define readl_be(addr) __raw_readl((__force unsigned *)addr) #define writel_be(val, addr) __raw_writel(val, (__force unsigned *)addr) -#elif defined(CONFIG_SPARC_LEON) -#define readl_be(addr) __raw_readl(addr) -#define writel_be(val, addr) __raw_writel(val, addr) #endif static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, -- 2.34.1