diff options
author | Jan Andersson <jan@gaisler.com> | 2011-05-19 14:47:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 19:49:52 -0400 |
commit | d5f6db9e1aff6ccf1876224f152c0268b0c8a992 (patch) | |
tree | b1daf4f5fd9b3d34790505ab16ac3f36c7f36630 | |
parent | fda928ac97dbf0359f3dc4c96925b7b422b540d7 (diff) |
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 <jan@gaisler.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/host/ehci.h | 3 |
1 files changed, 0 insertions, 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) | |||
628 | #if defined(CONFIG_ARM) && defined(CONFIG_ARCH_IXP4XX) | 628 | #if defined(CONFIG_ARM) && defined(CONFIG_ARCH_IXP4XX) |
629 | #define readl_be(addr) __raw_readl((__force unsigned *)addr) | 629 | #define readl_be(addr) __raw_readl((__force unsigned *)addr) |
630 | #define writel_be(val, addr) __raw_writel(val, (__force unsigned *)addr) | 630 | #define writel_be(val, addr) __raw_writel(val, (__force unsigned *)addr) |
631 | #elif defined(CONFIG_SPARC_LEON) | ||
632 | #define readl_be(addr) __raw_readl(addr) | ||
633 | #define writel_be(val, addr) __raw_writel(val, addr) | ||
634 | #endif | 631 | #endif |
635 | 632 | ||
636 | static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, | 633 | static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, |