]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: sound/mixart: avoid redefining {readl,write}_{le,be} accessors
authorFlorian Fainelli <florian@openwrt.org>
Tue, 9 Nov 2010 17:29:08 +0000 (18:29 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 11 Nov 2010 01:02:20 +0000 (02:02 +0100)
If the platform already provides a definition for these accessors
do not redefine them. The warning was caught on MIPS.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/mixart/mixart_hwdep.h

index a46f5083db99229c88797895b9de5170bede8245..812e288ef2e76eb58de27118a7522700f0f21a38 100644 (file)
 
 #include <sound/hwdep.h>
 
+#ifndef readl_be
 #define readl_be(x) be32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_be
 #define writel_be(data,addr) __raw_writel(cpu_to_be32(data),addr)
+#endif
 
+#ifndef readl_le
 #define readl_le(x) le32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_le
 #define writel_le(data,addr) __raw_writel(cpu_to_le32(data),addr)
+#endif
 
 #define MIXART_MEM(mgr,x)      ((mgr)->mem[0].virt + (x))
 #define MIXART_REG(mgr,x)      ((mgr)->mem[1].virt + (x))