From: Nobuhiro Iwamatsu Date: Mon, 18 Oct 2010 03:20:39 +0000 (+0900) Subject: ALSA: emu10k1: Fix warning: "CCR" redefined X-Git-Tag: upstream/snapshot3+hdmi~12401^2~37^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83fc3bc09518d42e8f5073e2a65884701dfadf19;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Cc: Paul Mundt Signed-off-by: Takashi Iwai --- diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 7dc97d1..4f865df 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -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 */