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

Commit 83fc3bc0 authored Oct 18, 2010 by Nobuhiro Iwamatsu Committed by Takashi Iwai Oct 18, 2010

ALSA: emu10k1: Fix warning: "CCR" redefined



CCR is defined in emu10k1, but SuperH is defined too.
If user use this driver with SuperH, it becomes a double definition.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 84cc5c0b

include/sound/emu10k1.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -438,6 +438,8 @@
		#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 */