Skip to content

Commit

Permalink
Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
Browse files Browse the repository at this point in the history
This reverts commit 83fc3bc.

sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit
a5f6ea2 ('sh: prefix sh-specific "CCR" and
"CCR2" by "SH_"').

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Geert Uytterhoeven authored and Takashi Iwai committed Mar 11, 2014
1 parent 5be50ac commit f1eaaf8
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions include/sound/emu10k1.h
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,6 @@
#define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */
#define CCCA_CURRADDR 0x18000008

/* undefine CCR to avoid conflict with the definition for SH */
#undef CCR
#define CCR 0x09 /* Cache control register */
#define CCR_CACHEINVALIDSIZE 0x07190009
#define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */
Expand Down

0 comments on commit f1eaaf8

Please sign in to comment.