summaryrefslogtreecommitdiffstats
path: root/sound/pci/mixart
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-11-09 18:29:08 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-11 02:02:20 +0100
commite9161512017f11050ef2b826cbb10be1673554c6 (patch)
tree64562da9944a4345f063c008a11dbd5d0a191128 /sound/pci/mixart
parent89feca1a16b05651d9c500e5572c0d6882873396 (diff)
downloadop-kernel-dev-e9161512017f11050ef2b826cbb10be1673554c6.zip
op-kernel-dev-e9161512017f11050ef2b826cbb10be1673554c6.tar.gz
ALSA: sound/mixart: avoid redefining {readl,write}_{le,be} accessors
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>
Diffstat (limited to 'sound/pci/mixart')
-rw-r--r--sound/pci/mixart/mixart_hwdep.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/mixart/mixart_hwdep.h b/sound/pci/mixart/mixart_hwdep.h
index a46f508..812e288 100644
--- a/sound/pci/mixart/mixart_hwdep.h
+++ b/sound/pci/mixart/mixart_hwdep.h
@@ -25,11 +25,21 @@
#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))
OpenPOWER on IntegriCloud