Skip to content

Commit

Permalink
ALSA: emu10k1: Fix warning: "CCR" redefined
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nobuhiro Iwamatsu authored and Takashi Iwai committed Oct 18, 2010
1 parent 84cc5c0 commit 83fc3bc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/sound/emu10k1.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 83fc3bc

Please sign in to comment.