diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-11-09 20:29:08 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-11 04:02:20 +0300 |
| commit | e9161512017f11050ef2b826cbb10be1673554c6 (patch) | |
| tree | 64562da9944a4345f063c008a11dbd5d0a191128 | |
| parent | 89feca1a16b05651d9c500e5572c0d6882873396 (diff) | |
| download | linux-e9161512017f11050ef2b826cbb10be1673554c6.tar.xz | |
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>
| -rw-r--r-- | sound/pci/mixart/mixart_hwdep.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/mixart/mixart_hwdep.h b/sound/pci/mixart/mixart_hwdep.h index a46f5083db99..812e288ef2e7 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)) |