ALSA: emu10k1: Fix warning: "CCR" redefined

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Nobuhiro Iwamatsu and committed by

Takashi Iwai 15 years ago 83fc3bc0 84cc5c0b

1 changed file

expand all

include

sound

emu10k1.h

include/sound/emu10k1.h

··· 438 438 #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ 439 439 #define CCCA_CURRADDR 0x18000008 440 440 441 + /* undefine CCR to avoid conflict with the definition for SH */ 442 + #undef CCR 441 443 #define CCR 0x09 /* Cache control register */ 442 444 #define CCR_CACHEINVALIDSIZE 0x07190009 443 445 #define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */