提交 f1eaaf8f 编写于 作者: G Geert Uytterhoeven 提交者: Takashi Iwai

Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"

This reverts commit 83fc3bc0.

sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit
a5f6ea29 ('sh: prefix sh-specific "CCR" and
"CCR2" by "SH_"').
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 5be50ac2
...@@ -436,8 +436,6 @@ ...@@ -436,8 +436,6 @@
#define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */
#define CCCA_CURRADDR 0x18000008 #define CCCA_CURRADDR 0x18000008
/* undefine CCR to avoid conflict with the definition for SH */
#undef CCR
#define CCR 0x09 /* Cache control register */ #define CCR 0x09 /* Cache control register */
#define CCR_CACHEINVALIDSIZE 0x07190009 #define CCR_CACHEINVALIDSIZE 0x07190009
#define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */ #define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册