Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Nobuhiro Iwamatsu 14 years ago
parent
84cc5c0bd3
commit
83fc3bc095
1 changed files with 2 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      include/sound/emu10k1.h

+ 2 - 0
include/sound/emu10k1.h
View File 

@@ -438,6 +438,8 @@
 
 #define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/
 
 #define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/
 
 #define CCCA_CURRADDR		0x18000008
 
 #define CCCA_CURRADDR		0x18000008
 
 
 
+/* undefine CCR to avoid conflict with the definition for SH */
 
+#undef CCR
 
 #define CCR			0x09		/* Cache control register				*/
 
 #define CCR			0x09		/* Cache control register				*/
 
 #define CCR_CACHEINVALIDSIZE	0x07190009
 
 #define CCR_CACHEINVALIDSIZE	0x07190009
 
 #define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/
 
 #define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/