At Mon, 18 Oct 2010 12:20:39 +0900, Nobuhiro Iwamatsu wrote:

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: Takashi iwai tiwai@suse.de CC: Paul Mundt lethal@linux-sh.org

Thanks, I applied the patch with an additional commit in the code.

Takashi

---

include/sound/emu10k1.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 7dc97d1..d1fcc31 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -438,6 +438,7 @@ #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ #define CCCA_CURRADDR 0x18000008

+#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 */

1.7.1

-- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html