Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1eaaf8f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Takashi Iwai
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5be50ac2

include/sound/emu10k1.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -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    	*/